update general state tests fillers to suite blockchain

42 files changed, 250 insertions, 251 deletions

diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json
index 61754490c..d1149d74d 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionFiller.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitConstruction " : {
+    "dayLimitConstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -30,7 +30,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
@@ -40,26 +40,7 @@
 	    {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : ["EIP158"],
-                "result" : {
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x",
-                        "nonce" : "0x02",
-                        "storage" : {
-                        }
-                    },
-                    "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
-                        "shouldnotexist" : "1"
-                    }
-                }
-            },
-	    {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 1,
+                    "gas" : [0,1],
                     "value" : -1
                 },
                 "network" : ["EIP158"],
@@ -77,7 +58,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json
index 107363bdc..9981fd9e6 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionOOGFiller.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitConstructionOOG " : {
+    "dayLimitConstructionOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -15,7 +15,31 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
+                "network" : ["Frontier"],
+                "result" : {
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "273283",
+                        "code" : "0x",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999394984",
+                        "code" : "0x",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "0x04661a",
@@ -59,4 +83,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json
index 30df2068f..fed0f154d 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitConstructionPartialFiller.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitConstructionPartial " : {
+    "dayLimitConstructionPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Frontier"],
+                "network" : ["Frontier", "Homestead", "EIP150"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "code" : "0x",
@@ -30,7 +30,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
@@ -43,7 +43,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP150", "EIP158"],
+                "network" : ["EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "code" : "0x",
@@ -52,7 +52,15 @@
                         }
                     },
                     "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
-                        "shouldnotexist" : "1"
+                        "balance" : "0x64",
+                        "code" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
+                            "nonce" : "0x01",
+                            "storage" : {
+                                "0x00" : "0x01",
+                                "0x01" : "0x01",
+                                "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                                "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
+                            }
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json
index 5f2a9361d..6ce687781 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitResetSpentTodayFiller.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitResetSpentToday " : {
+    "dayLimitResetSpentToday" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json
index 50bd8e8c5..c4a996755 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitFiller.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitSetDailyLimit " : {
+    "dayLimitSetDailyLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json
index a71743694..98cffe66a 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/dayLimitSetDailyLimitNoDataFiller.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitSetDailyLimitNoData " : {
+    "dayLimitSetDailyLimitNoData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json
index bbf7677da..eb52a81e6 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerAddMyselfFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedAddOwnerAddMyself " : {
+    "multiOwnedAddOwnerAddMyself" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json
index 130bce370..b121bef41 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedAddOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedAddOwner " : {
+    "multiOwnedAddOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json
index 4c19980d8..52dc74ac0 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner " : {
+    "multiOwnedChangeOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json
index 3b8f7b19a..69a9e4269 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwnerNoArgumentFiller.json
@@ -2,10 +2,10 @@
     "multiOwnedChangeOwnerNoArgument" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json
index b2bb026b8..ddcf0b04a 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_fromNotOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner_fromNotOwner " : {
+    "multiOwnedChangeOwner_fromNotOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json
index 78c1dc5f6..99be1abef 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeOwner_toIsOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner_toIsOwner " : {
+    "multiOwnedChangeOwner_toIsOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json
index 24d782d3c..ef467279e 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo0Filler.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo0 " : {
+    "multiOwnedChangeRequirementTo0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json
index bb560820b..cf7be29fc 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo1Filler.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo1 " : {
+    "multiOwnedChangeRequirementTo1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json
index 412a7e9c8..712883c9f 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedChangeRequirementTo2Filler.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo2 " : {
+    "multiOwnedChangeRequirementTo2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json
index 32cbf8cbf..857e83ffd 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionCorrectFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionCorrect " : {
+    "multiOwnedConstructionCorrect" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json
index f4aec8ec7..6fa98087d 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionNotEnoughGas " : {
+    "multiOwnedConstructionNotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -59,4 +59,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json
index 233f77858..3b982e4bb 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedConstructionNotEnoughGasPartialFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionNotEnoughGasPartial " : {
+    "multiOwnedConstructionNotEnoughGasPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json
index 4e3d6a423..241e0c2b3 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerFalseFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedIsOwnerFalse " : {
+    "multiOwnedIsOwnerFalse" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json
index 7420a61d1..e6a22ca88 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedIsOwnerTrueFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedIsOwnerTrue " : {
+    "multiOwnedIsOwnerTrue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json
index d33a19e0f..3bd68bebf 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerByNonOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwnerByNonOwner " : {
+    "multiOwnedRemoveOwnerByNonOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json
index a84ef5d6d..f240d7933 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner " : {
+    "multiOwnedRemoveOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json
index 21c42d064..d636fc4ee 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_mySelfFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner_mySelf " : {
+    "multiOwnedRemoveOwner_mySelf" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json
index 0ac00eeca..97766917c 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner_ownerIsNotOwner " : {
+    "multiOwnedRemoveOwner_ownerIsNotOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json
index d6bf86ec2..4b52ba65d 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/multiOwnedRevokeNothingFiller.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRevokeNothing " : {
+    "multiOwnedRevokeNothing" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json
index e849664b8..5344cf137 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletAddOwnerRemovePendingTransactionFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletAddOwnerRemovePendingTransaction " : {
+    "walletAddOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json
index 9f95706b1..2a259de07 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletChangeOwnerRemovePendingTransactionFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletChangeOwnerRemovePendingTransaction " : {
+    "walletChangeOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json
index 171ff5a2d..d896301be 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletChangeRequirementRemovePendingTransactionFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletChangeRequirementRemovePendingTransaction " : {
+    "walletChangeRequirementRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json
index 5d173bc56..a1e9713e8 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletConfirmFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletConfirm " : {
+    "walletConfirm" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json
index 3a412549d..f5a665177 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletConstruction " : {
+    "walletConstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -30,7 +30,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
@@ -40,26 +40,7 @@
 	    {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : 0,
-                    "value" : -1
-                },
-                "network" : ["EIP158"],
-                "result" : {
-                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "code" : "0x",
-                        "nonce" : "0x02",
-                        "storage" : {
-                        }
-                    },
-                    "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
-                        "shouldnotexist" : "1"
-                    }
-                }
-            },
-	    {
-                "indexes" : {
-                    "data" : -1,
-                    "gas" : 1,
+                    "gas" : [0,1],
                     "value" : -1
                 },
                 "network" : ["EIP158"],
@@ -77,7 +58,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json
index f2b132944..428bd6e30 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionOOGFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletConstructionOOG " : {
+    "walletConstructionOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -18,14 +18,14 @@
                 "network" : ["Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "0x0607d7",
+                        "balance" : "380223",
                         "code" : "0x",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "0x0de0b6b3a758e854",
+                        "balance" : "999999999999288044",
                         "code" : "0x",
                         "nonce" : "0x02",
                         "storage" : {
@@ -38,7 +38,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
@@ -51,24 +51,33 @@
                     "gas" : 1,
                     "value" : -1
                 },
-                "network" : ["Homestead", "EIP150", "EIP158"],
+                "network" : ["EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                        "balance" : "1225022",
+                        "balance" : "1210063",
                         "code" : "0x",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999998443345",
+                        "balance" : "999999999998458204",
                         "code" : "0x",
                         "nonce" : "0x02",
                         "storage" : {
                         }
                     },
                     "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
-                        "shouldnotexist" : "1"
+                         "balance" : "0x64",
+                        "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
+                        "nonce" : "1",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x0107" : "0",
+                            "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
+                        }
                     }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json
index 9501c2362..8c1f7cfed 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletConstructionPartialFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletConstructionPartial " : {
+    "walletConstructionPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -29,7 +29,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
@@ -56,7 +56,7 @@
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json
index 96c037db6..90645a300 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletDefault " : {
+    "walletDefault" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json
index facaac5eb..b285817c9 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletDefaultWithOutValueFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletDefaultWithOutValue " : {
+    "walletDefaultWithOutValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -83,4 +83,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json
index ec5f2d29a..5328c43cd 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitMultiOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletExecuteOverDailyLimitMultiOwner " : {
+    "walletExecuteOverDailyLimitMultiOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -30,16 +30,16 @@
                             "0x00" : "0x02",
                             "0x01" : "0x02",
                             "0x0104" : "0x01",
-                            "0x0107" : "0x0c22e4",
-                            "0x029ce8b5ed1ceb8b4214e1e4b32e1339c9010e59436b491c0ce1657166643fc0" : "0x01",
-                            "0x029ce8b5ed1ceb8b4214e1e4b32e1339c9010e59436b491c0ce1657166643fc1" : "0x02",
+                            "0x0107" : "0",
+                            "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01",
+                            "0x5fd43ee7113b9859f7cab1408959b063a9b2e07b4c9ec4098b2768db95a4cba8" : "0x02",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x04" : "0x3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4",
-                            "0x4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe" : "0x9344128c184e12699a4c109356a902687a5b558b9c6afcf071bfb0bfb1fb3143",
-                            "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01",
+                            "0x4c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe" : "0x28e0e8f21c16f43aaa1e26147fb1cc74296cd3823267fa5bebc02e090063c36d",
+                            "0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043e" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa",
                             "0xd3e69d8c7f41f7aeaf8130ddc53047aeee8cb46a73d6bae86b7e7d6bf8312e6b" : "0x02",
-                            "0xf4622fc20061c8aaca639a0d3ec89f09c9a89495d235d4c2edc69a470bfb9f99" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa",
-                            "0xf4622fc20061c8aaca639a0d3ec89f09c9a89495d235d4c2edc69a470bfb9f9a" : "0x09"
+                            "0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043f" : "0x09",
+                            "0x5fd43ee7113b9859f7cab1408959b063a9b2e07b4c9ec4098b2768db95a4cba7" : "0x01"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json
index a83aa8a4b..50c487f17 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletExecuteOverDailyLimitOnlyOneOwner " : {
+    "walletExecuteOverDailyLimitOnlyOneOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -31,11 +31,11 @@
                             "0x01" : "0x01",
                             "0x0104" : "0x01",
                             "0x0105" : "0x04",
-                            "0x0107" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01",
-                            "0xf4622fc20061c8aaca639a0d3ec89f09c9a89495d235d4c2edc69a470bfb9f99" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa",
-                            "0xf4622fc20061c8aaca639a0d3ec89f09c9a89495d235d4c2edc69a470bfb9f9a" : "0x09"
+                            "0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043e" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa",
+                            "0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043f" : "0x09"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json
index df7daa7fd..be4ec9a0b 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNewFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletExecuteOverDailyLimitOnlyOneOwnerNew " : {
+    "walletExecuteOverDailyLimitOnlyOneOwnerNew" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -34,8 +34,8 @@
                             "0x0107" : "0x0c22e4",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01",
-                            "0xf4622fc20061c8aaca639a0d3ec89f09c9a89495d235d4c2edc69a470bfb9f99" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa",
-                            "0xf4622fc20061c8aaca639a0d3ec89f09c9a89495d235d4c2edc69a470bfb9f9a" : "0x09"
+                            "0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043f" : "0x09",
+                            "0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043e" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json
index 7ba62a225..6d77abbbc 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletExecuteUnderDailyLimitFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletExecuteUnderDailyLimit " : {
+    "walletExecuteUnderDailyLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,25 +22,21 @@
                         "storage" : {
                         }
                     },
-                    "aaaf5374fce5edbc8e2a8697c15331677e6ebaaa" : {
-                        "balance" : "0x09",
-                        "code" : "0x",
-                        "nonce" : "0x00",
-                        "storage" : {
-                        }
-                    },
                     "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
-                        "balance" : "0x5b",
+                        "balance" : "100",
                         "code" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe",
                         "nonce" : "0x00",
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
+                            "0x0104" : "0x01",
                             "0x0105" : "0xff",
-                            "0x0106" : "0x09",
-                            "0x0107" : "0x0c22e4",
+                            "0x0106" : "0x0c22e4",
+                            "0x0107" : "0",
                             "0x03" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                            "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01"
+                            "0x6e369836487c234b9e553ef3f787c2d8865520739d340c67b3d251a33986e58d" : "0x01",
+"0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043e" : "0xaaaf5374fce5edbc8e2a8697c15331677e6ebaaa",
+"0x69d836d8d4229a4b7482679c45208e1a6079c5be2775a4a87ca2d168319c043f" : "0x09"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json
index f8879f3e5..6a80a1efd 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletKillFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletKill " : {
+    "walletKill" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json
index 86de9beb5..a32830446 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletKillNotByOwnerFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletKillNotByOwner " : {
+    "walletKillNotByOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json
index c16b160b3..95fab59e9 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletKillToWalletFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletKillToWallet " : {
+    "walletKillToWallet" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json b/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json
index ed500933c..d70c08281 100644
--- a/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stWalletTest/walletRemoveOwnerRemovePendingTransactionFiller.json
@@ -1,11 +1,11 @@
 {
-    "walletRemoveOwnerRemovePendingTransaction " : {
+    "walletRemoveOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [