corrected random test fillers for blockchain

author: Dimitry <dimitry@ethdev.com> 2017-02-08 05:34:45 +0800
committer: Dimitry <dimitry@ethdev.com> 2017-02-10 02:24:55 +0800
commit: 86e11be43aecf360a8d5f16edecfa7b378081fb9 (patch)
tree: fa403ffaf2e92a9d373c8bb90e57c178af7e87c1 /src
parent: 7cb53c1950ee7c0101c62028bacabfcd2761bd46 (diff)
download: dexon-tests-86e11be43aecf360a8d5f16edecfa7b378081fb9.tar.gz
dexon-tests-86e11be43aecf360a8d5f16edecfa7b378081fb9.tar.zst
dexon-tests-86e11be43aecf360a8d5f16edecfa7b378081fb9.zip
643 files changed, 2120 insertions, 2093 deletions
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest0Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest0Filler.json
index 5582f1c37..d47d2bb3c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest0Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest0Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest0" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest100Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest100Filler.json
index 58d8c3a89..6860b8235 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest100Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest100Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest100" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,17 +22,18 @@
                         "code" : "0x414243444342444283f24455",
                         "nonce" : "0",
                         "storage" : {
+			    "0x20000" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "35175",
+                        "balance" : "92950",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999864871",
+                        "balance" : "999999999999807096",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest101Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest101Filler.json
index 95003bb2b..085aed09d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest101Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest101Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest101" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest102Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest102Filler.json
index 1c03e451c..aa898337b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest102Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest102Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest102" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest103Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest103Filler.json
index fc68df65f..5b95f6593 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest103Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest103Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest103" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest104Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest104Filler.json
index 5bbdfa30b..3efff6052 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest104Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest104Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest104" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest105Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest105Filler.json
index dcb5f40f4..4d2ab875c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest105Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest105Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest105" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest106Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest106Filler.json
index e063da3ba..07ce90343 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest106Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest106Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest106" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest107Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest107Filler.json
index 5d5abc31d..020dca1d2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest107Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest107Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest107" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest108Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest108Filler.json
index 4848017e7..e722de28e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest108Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest108Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest108" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "49585",
+                        "balance" : "50059",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999850461",
+                        "balance" : "999999999999849987",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest109Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest109Filler.json
index 3096b30e4..851352422 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest109Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest109Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest109" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest10Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest10Filler.json
index b4124bb75..500baafba 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest10Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest10Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest10" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest110Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest110Filler.json
index 6f75a318f..1f9b1753e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest110Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest110Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest110" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest111Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest111Filler.json
index 14796ed5d..c0015c28b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest111Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest111Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest111" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest112Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest112Filler.json
index cc394a938..6b0d1f776 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest112Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest112Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest112" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest113Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest113Filler.json
index 5ff2a59a2..1a64ec2e8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest113Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest113Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest113" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest114Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest114Filler.json
index 3d49dc782..5d63ca928 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest114Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest114Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest114" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest115Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest115Filler.json
index 7c14ff248..f110d69da 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest115Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest115Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest115" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest116Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest116Filler.json
index d56615a21..0c72eba24 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest116Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest116Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest116" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest117Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest117Filler.json
index 0d66ac63a..1abea6a4d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest117Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest117Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest117" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest118Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest118Filler.json
index 02ee80ef1..37c269d67 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest118Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest118Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest118" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest119Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest119Filler.json
index a837c53fb..67bfcefc0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest119Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest119Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest119" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest11Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest11Filler.json
index f880ee5cd..d3e11836b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest11Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest11Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest11" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest120Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest120Filler.json
index 62f309750..7b63bcc35 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest120Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest120Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest120" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest121Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest121Filler.json
index f8e6dd05e..baa0b567f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest121Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest121Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest121" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest122Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest122Filler.json
index 6f700f88f..f44a102d9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest122Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest122Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest122" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest123Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest123Filler.json
index 7c8f1d77b..09549bacd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest123Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest123Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest123" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x41444541084455",
                         "nonce" : "0",
                         "storage" : {
-                            "0x051d6a3cd647" : "0x03aace415245"
+                            "0x051d6a3cd647" : "0x00",
+			    "0x20000" : "0x71b4"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest124Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest124Filler.json
index c0cd1dd29..0a444bcd0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest124Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest124Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest124" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest125Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest125Filler.json
index 129711705..60693e807 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest125Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest125Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest125" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest126Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest126Filler.json
index b274bbdfb..cdf9683b0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest126Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest126Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest126" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest127Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest127Filler.json
index 4e79bd38e..df1f70493 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest127Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest127Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest127" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x4241424540444145084555",
                         "nonce" : "0",
                         "storage" : {
-                            "0x7fffffffffffffff" : "0x03aace415245"
+                            "0x7fffffffffffffff" : "0x00000000000000000000000000000000000000000000000000000000000071b4"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest128Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest128Filler.json
index c1a0b1bf8..b29273ffd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest128Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest128Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest128" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest129Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest129Filler.json
index a11d06a8e..9d1500b68 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest129Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest129Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest129" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest12Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest12Filler.json
index e475f434c..c8a5ecc68 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest12Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest12Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest12" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest130Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest130Filler.json
index d850cbd1e..264229486 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest130Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest130Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest130" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest131Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest131Filler.json
index fd0cfd8f1..65dd90c30 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest131Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest131Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest131" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest132Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest132Filler.json
index d001e14e6..268b21931 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest132Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest132Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest132" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest133Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest133Filler.json
index 3b8ccdd03..5466b96a0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest133Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest133Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest133" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest134Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest134Filler.json
index 4c385d8bd..744cc709d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest134Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest134Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest134" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest135Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest135Filler.json
index bcea447d3..941ead530 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest135Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest135Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest135" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest136Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest136Filler.json
index 8cd673ead..8eef5aea3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest136Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest136Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest136" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -26,14 +26,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "49783",
+                        "balance" : "49791",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999109550298",
+                        "balance" : "999999999109550290",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest137Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest137Filler.json
index 7ee157c37..1986996f4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest137Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest137Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest137" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json
index eb8b108e7..0c07b2e00 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest138Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest138" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -17,7 +17,7 @@
                 },
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
-                    "0000000000000000000000000000051d6a3cd647" : {
+                    "0000000000000000000000000000000000020000" : {
                         "balance" : "50000",
                         "code" : "0x",
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json
index 1af55d6de..836d8b77f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest139Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest139" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x33447f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff434461334515455560005155",
                         "nonce" : "0x00",
                         "storage" : {
-                            "0x00" : "0x051d6a3cd647"
+                            "0x00" : "0x020000"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest13Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest13Filler.json
index 420c074de..2a39caa28 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest13Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest13Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest13" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest140Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest140Filler.json
index da03d538e..7f55b9989 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest140Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest140Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest140" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest141Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest141Filler.json
index d56fac27a..4a51e89c7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest141Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest141Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest141" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,18 @@
                         "code" : "0x4544424140204555",
                         "nonce" : "0",
                         "storage" : {
-                            "0x7fffffffffffffff" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                            "0x7fffffffffffffff" : "0xae72e2bf2302ebcd309e003e5be58830f96deddaf87bb89eeea159388bfe3ec1"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "41183",
+                        "balance" : "41464",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999858863",
+                        "balance" : "999999999999858582",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest142Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest142Filler.json
index 47fe6a602..fc1de7369 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest142Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest142Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest142" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest143Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest143Filler.json
index f7e4fe3b0..9cee0325f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest143Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest143Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest143" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,18 @@
                         "code" : "0x414341414243421a2055",
                         "nonce" : "0",
                         "storage" : {
-                            "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                            "0xae72e2bf2302ebcd309e003e5be58830f96deddaf87bb89eeea159388bfe3ec1" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "41170",
+                        "balance" : "41451",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999858876",
+                        "balance" : "999999999999858595",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest144Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest144Filler.json
index 5e0c29c0f..92f13f5e9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest144Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest144Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest144" : {
         "env" : {
             "currentCoinbase" : "b0085a57673c8f7d78fb870418f622e42fd686e4",
-            "currentDifficulty" : "0x4f4e83f92fe81c08",
+            "currentDifficulty" : "131072",
             "currentGasLimit" : "0x5c1948c7",
-            "currentNumber" : "0x1010db29",
-            "currentTimestamp" : "0x84d8d598bc8dae70",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "b93e460c74488b6f2f57690e5fa535c88ad8db30408cad2d66e104795e8ac02e"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest145Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest145Filler.json
index bb5d555ed..c6e10dd4a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest145Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest145Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest145" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest146Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest146Filler.json
index 5e3847063..df992b2c4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest146Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest146Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest146" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "30192",
+                        "balance" : "72974",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999869854",
+                        "balance" : "999999999999827072",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest147Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest147Filler.json
index 53b1637ee..5369586a6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest147Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest147Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest147" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest148Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest148Filler.json
index eeddb164e..141af9091 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest148Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest148Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest148" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json
index b201717fa..843afdf39 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest149Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest149" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest14Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest14Filler.json
index 1d9e0bead..68eeb59a6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest14Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest14Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest14" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest150Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest150Filler.json
index 26f52b997..f62e1b6bf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest150Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest150Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest150" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest151Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest151Filler.json
index 8fda69628..83a9b6dd6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest151Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest151Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest151" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "330546",
+                        "balance" : "332075",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999569500",
+                        "balance" : "999999999999567971",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest152Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest152Filler.json
index 103c1853b..fb5a716dd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest152Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest152Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest152" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c35041407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350525942525917526117908060005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0xc3" : "0x1790"
+			    "0x00" : "0x1790",
+                            "0xc3" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest153Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest153Filler.json
index 118a40c98..b0c54e083 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest153Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest153Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest153" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,19 @@
                         "code" : "0x44420b4442432055",
                         "nonce" : "0",
                         "storage" : {
-                            "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" : "0x051d6a3cd647"
+                            "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" : "0x00",
+			    "0xae72e2bf2302ebcd309e003e5be58830f96deddaf87bb89eeea159388bfe3ec1" : "0x20000"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "41168",
+                        "balance" : "41449",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999858878",
+                        "balance" : "999999999999858597",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest154Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest154Filler.json
index 66d03c633..aa75d6bc4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest154Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest154Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest154" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest155Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest155Filler.json
index 50fe877eb..89b139942 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest155Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest155Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest155" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest156Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest156Filler.json
index 641926e8e..39deebc82 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest156Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest156Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest156" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest157Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest157Filler.json
index bbed7063c..53516a8ed 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest157Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest157Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest157" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest158Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest158Filler.json
index 50607148d..244213544 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest158Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest158Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest158" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json
index bdd3bb630..85cc9830d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest159Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest159" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest15Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest15Filler.json
index 24c5e7b72..4e65b5dee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest15Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest15Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest15" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest160Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest160Filler.json
index 6b2de4202..17d79f2dd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest160Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest160Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest160" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,18 @@
                         "code" : "0x4242434444454443525520307555",
                         "nonce" : "0",
                         "storage" : {
-                            "0x7fffffffffffffff" : "0x051d6a3cd647"
+                            "0x7fffffffffffffff" : "0x20000"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "41171",
+                        "balance" : "86249",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999858875",
+                        "balance" : "999999999999813797",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest161Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest161Filler.json
index 0ed2ae7f4..f5da831fc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest161Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest161Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest161" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest162Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest162Filler.json
index 730c925f8..3e8209d56 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest162Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest162Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest162" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest163Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest163Filler.json
index de106cb7b..19737a791 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest163Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest163Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest163" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "113713443",
+                        "balance" : "113735807",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998307161690",
+                        "balance" : "999999998307139326",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest164Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest164Filler.json
index 80d5a1508..98926ca60 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest164Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest164Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest164" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest165Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest165Filler.json
index ff5316816..24a7ef7fb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest165Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest165Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest165" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x41404244444145085955",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0x03aace415245"
+                            "0x00" : "0x71b4"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest166Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest166Filler.json
index 29d71083b..d5e74f84f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest166Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest166Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest166" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest167Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest167Filler.json
index 8276ddc2a..2fecf36e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest167Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest167Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest167" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest168Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest168Filler.json
index 6437d0f23..e626fb324 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest168Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest168Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest168" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest169Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest169Filler.json
index 7ea7f6acf..46ead758a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest169Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest169Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest169" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest16Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest16Filler.json
index 7766ebb00..65a0ca92a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest16Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest16Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest16" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest170Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest170Filler.json
index 5edbc5099..696e75102 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest170Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest170Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest170" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json
index e7cae1b79..c60f28349 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest171Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest171" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json
index ac8377e10..24f3dd8f1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest172Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest172" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest173Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest173Filler.json
index 16d820bf0..554d121c7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest173Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest173Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest173" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest174Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest174Filler.json
index ab9ec55cf..9c41f7034 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest174Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest174Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest174" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,17 +22,18 @@
                         "code" : "0x434155",
                         "nonce" : "0",
                         "storage" : {
+			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "26118",
+                        "balance" : "41118",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999873928",
+                        "balance" : "999999999999858928",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest175Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest175Filler.json
index 3af362ebd..356f410cb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest175Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest175Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest175" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest176Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest176Filler.json
index 402bd13f2..be82f1480 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest176Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest176Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest176" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest177Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest177Filler.json
index ffdc8d38c..aa143e390 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest177Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest177Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest177" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest178Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest178Filler.json
index 5cd45310f..af319f4e8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest178Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest178Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest178" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest179Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest179Filler.json
index 3c0f544d3..4533919bd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest179Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest179Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest179" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest17Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest17Filler.json
index 6c4ee8c21..884a24045 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest17Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest17Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest17" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001430a7f000000000000000000000000000000000000000000000000000000000000000106813b375560005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x01" : "0x01",
+                            "0x01" : "0x00",
+			    "0x03e8" : "0x01",
                             "0x7f000000000000000000000000000000000000000000000000000000000000c3" : "0xc350"
                         }
                     },
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest180Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest180Filler.json
index 48245516f..8df851f3a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest180Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest180Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest180" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest181Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest181Filler.json
index 473012fc1..c7b4fc959 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest181Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest181Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest181" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,18 @@
                         "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000000427f0000000000000000000000010000000000000000000000000000000000000000407f00000000000000000000000000000000000000000000000000000000000000014253593560005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x01000000000000000000000000000000000000000000000000000000000000" : "0x7f000000000000000000000000000000000000000000000000000000000000"
+                            "0x01000000000000000000000000000000000000000000000000000000000000" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "43137",
+                        "balance" : "28232",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998153316726",
+                        "balance" : "999999998153331631",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest182Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest182Filler.json
index 83665a865..6c4fbd95a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest182Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest182Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest182" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,19 @@
                         "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe60600943608f5560005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9f"
+                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9f",
+			    "0x8f" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "58264",
+                        "balance" : "73264",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999985303975",
+                        "balance" : "999999999985288975",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest183Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest183Filler.json
index eae009ebd..650c8c293 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest183Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest183Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest183" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json
index f9083fe3a..c10c42333 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest184Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest184" : {
         "env" : {
             "currentCoinbase" : "6d6e40885310545835a5b582dbc23ef026404bda",
-            "currentDifficulty" : "0x266dbce6",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x2b7fe66d",
-            "currentNumber" : "0x1",
-            "currentTimestamp" : "0x775b1d0c",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "10000",
             "previousHash" : "a8228e05d900b890136bcc55628b479e172795042a90e18b673189b5f3a672fc"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest185Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest185Filler.json
index 1c9452e4c..a4a2a7b7a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest185Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest185Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest185" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest186Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest186Filler.json
index eecbe8e78..f8be2119c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest186Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest186Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest186" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x45454340424244444131599455",
                         "nonce" : "0",
                         "storage" : {
-                            "0x01" : "0x2e"
+                            "0x01" : "0x00",
+			    "0x03e8" : "0x2e"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest187Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest187Filler.json
index 4cab0ae95..55bccd57a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest187Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest187Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest187" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest188Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest188Filler.json
index deeadd0fb..17797f5dc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest188Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest188Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest188" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest189Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest189Filler.json
index de47d1193..fb37dcb25 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest189Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest189Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest189" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest18Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest18Filler.json
index 9b5457312..b5abae59e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest18Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest18Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest18" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json
index 6d1e5d348..b79ac7b48 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest190Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest190" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest191Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest191Filler.json
index eca2b6f66..9c4b6c04b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest191Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest191Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest191" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest192Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest192Filler.json
index 9383d1893..9867d6757 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest192Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest192Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest192" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest193Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest193Filler.json
index 1820f77fc..6fed3bfeb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest193Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest193Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest193" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json
index f8b93fb91..ff2532fe9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest194Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest194" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest195Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest195Filler.json
index c7b251714..da382e022 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest195Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest195Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest195" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest196Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest196Filler.json
index 51a04ff83..5dfd13c5e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest196Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest196Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest196" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest197Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest197Filler.json
index 097c36dc1..06edc8fef 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest197Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest197Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest197" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest198Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest198Filler.json
index d3a1e5873..83c294ae2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest198Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest198Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest198" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest199Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest199Filler.json
index 4502697f0..a3f0e55c7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest199Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest199Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest199" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x30424543074242413155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x2e" : "0x01"
+                            "0x2e" : "0x03e8"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest19Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest19Filler.json
index 8c528fe9c..69a43392d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest19Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest19Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest19" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest1Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest1Filler.json
index 8112b2ebd..a4b76b64c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest1Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest1Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest1" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -18,21 +18,21 @@
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "1000000000000100000",
+                        "balance" : "1000000000000000000",
                         "code" : "0x454543414341444259f2",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "30172",
+                        "balance" : "400046",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999869874",
+                        "balance" : "999999999999600000",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest200Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest200Filler.json
index 8b666fb74..7031e67c9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest200Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest200Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest200" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest201Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest201Filler.json
index b87f6bdf8..a547c3284 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest201Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest201Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest201" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest202Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest202Filler.json
index db0328736..a012185fa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest202Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest202Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest202" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest203Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest203Filler.json
index af5b28da0..c0d52b2bb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest203Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest203Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest203" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest204Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest204Filler.json
index 64542a464..3bb6c85ce 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest204Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest204Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest204" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest205Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest205Filler.json
index 0f4ae3a3a..8973af42c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest205Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest205Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest205" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest206Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest206Filler.json
index 1e634ae4c..81dd7b298 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest206Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest206Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest206" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest207Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest207Filler.json
index a83b52669..1e11f1438 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest207Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest207Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest207" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x43413160439155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0x2e"
+                            "0x01" : "0x2e"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest208Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest208Filler.json
index 6dbcd8172..8fb12df55 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest208Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest208Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest208" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest209Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest209Filler.json
index 76c97d6c5..578b63586 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest209Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest209Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest209" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest20Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest20Filler.json
index 089458840..8181c7a91 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest20Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest20Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest20" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest210Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest210Filler.json
index 1700c9226..0b52ffb4c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest210Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest210Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest210" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest211Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest211Filler.json
index 932be639d..3f0343dd4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest211Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest211Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest211" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest212Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest212Filler.json
index 05f46f289..9b14fe740 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest212Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest212Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest212" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest213Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest213Filler.json
index e5997ffc5..c24fd255c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest213Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest213Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest213" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest214Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest214Filler.json
index 9929af838..3d449cf4e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest214Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest214Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest214" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest215Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest215Filler.json
index e523e66c5..3dd1b0503 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest215Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest215Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest215" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest216Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest216Filler.json
index 1d5e79a86..085139607 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest216Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest216Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest216" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest217Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest217Filler.json
index 107c1ce62..82e323df4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest217Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest217Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest217" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest218Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest218Filler.json
index 3b46b620d..0827e84a1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest218Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest218Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest218" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest219Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest219Filler.json
index c212a4416..5acb563af 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest219Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest219Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest219" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest21Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest21Filler.json
index 0b666ef54..1cb4a43ec 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest21Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest21Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest21" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "21198",
+                        "balance" : "21386",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999878848",
+                        "balance" : "999999999999878660",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest220Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest220Filler.json
index 4cb430927..d021c9d50 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest220Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest220Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest220" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest221Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest221Filler.json
index b458a677a..bb0642e8b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest221Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest221Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest221" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest222Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest222Filler.json
index 9efd3628c..929f1f7c0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest222Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest222Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest222" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest223Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest223Filler.json
index 6cc9555b4..fd0a350f9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest223Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest223Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest223" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest224Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest224Filler.json
index 400d52aa6..9056fccef 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest224Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest224Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest224" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest225Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest225Filler.json
index 77c6c3ab4..42b1c9749 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest225Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest225Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest225" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest226Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest226Filler.json
index 37fbd5774..7f030ea05 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest226Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest226Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest226" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest227Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest227Filler.json
index 1493d7a02..e73dc5c10 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest227Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest227Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest227" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest228Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest228Filler.json
index 07c4ce363..13987bde3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest228Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest228Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest228" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest229Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest229Filler.json
index a39067c36..d07217ee5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest229Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest229Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest229" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x42434145410844455055",
                         "nonce" : "0",
                         "storage" : {
-                            "0x051d6a3cd647" : "0x7fffffffffffffff"
+                            "0x051d6a3cd647" : "0x00",
+			    "0x20000" : "0x0000000000000000000000000000000000000000000000007fffffffffffffff"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest22Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest22Filler.json
index 388239b94..77d6a1ec0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest22Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest22Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest22" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json
index b605c2a3b..65086a422 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest230Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest230" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest231Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest231Filler.json
index d9a39eda1..43b15e6c3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest231Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest231Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest231" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest232Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest232Filler.json
index e55ee4498..47d39c5db 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest232Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest232Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest232" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest233Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest233Filler.json
index af52f2441..10c9961e7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest233Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest233Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest233" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest234Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest234Filler.json
index 9a04d9d03..6f5379beb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest234Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest234Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest234" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest235Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest235Filler.json
index 78acb37ec..6f8115ec4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest235Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest235Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest235" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest236Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest236Filler.json
index aa12a2626..6618f8fb9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest236Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest236Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest236" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest237Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest237Filler.json
index aaba819af..9c54e65a4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest237Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest237Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest237" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest238Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest238Filler.json
index 94fbd0e6d..56583e333 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest238Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest238Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest238" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest239Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest239Filler.json
index 6fe4c84a5..9561f7f73 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest239Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest239Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest239" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest23Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest23Filler.json
index 1cb796bb8..665c6b5ed 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest23Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest23Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest23" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest240Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest240Filler.json
index 1402681e7..a7acec5ed 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest240Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest240Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest240" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest241Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest241Filler.json
index 30bfef8e7..10bdfd2ed 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest241Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest241Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest241" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x41421942450855678a044455",
                         "nonce" : "0",
                         "storage" : {
-                            "0x8000000000000000" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                            "0x8000000000000000" : "0",
+			    "0x80000000000003e7" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest242Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest242Filler.json
index 6fb8fa041..486714ab1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest242Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest242Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest242" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest243Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest243Filler.json
index b58cb07f1..107bc98e8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest243Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest243Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest243" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest244Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest244Filler.json
index 54802bf24..225fa0b64 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest244Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest244Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest244" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest245Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest245Filler.json
index 427b29380..cb5c331af 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest245Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest245Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest245" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest246Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest246Filler.json
index 8afc6ddcd..48452a172 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest246Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest246Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest246" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x434241314441434293170955",
                         "nonce" : "0",
                         "storage" : {
-                            "0xd9250a4f8c" : "0x01"
+                            "0xd9250a4f8c" : "0x00",
+			    "0xe03b" : "0x03e8"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest247Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest247Filler.json
index 731fabf16..758ad82d1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest247Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest247Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest247" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest248Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest248Filler.json
index 8cec6060b..c2c5862df 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest248Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest248Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest248" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest249Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest249Filler.json
index 776000c86..9a49900e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest249Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest249Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest249" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest24Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest24Filler.json
index cf07ba359..093680dfc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest24Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest24Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest24" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest250Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest250Filler.json
index 996da47ff..4b3ace3cb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest250Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest250Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest250" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest251Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest251Filler.json
index e1ecb4ccc..d2227cf14 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest251Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest251Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest251" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest252Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest252Filler.json
index 1a5d85cc4..c9d56adf6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest252Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest252Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest252" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest253Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest253Filler.json
index 92279d7b2..b8c3d3e01 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest253Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest253Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest253" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "30195",
+                        "balance" : "27990",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999869851",
+                        "balance" : "999999999999872056",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest254Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest254Filler.json
index 031c2d70c..1fc19f4f8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest254Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest254Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest254" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest255Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest255Filler.json
index 521fa67c8..dfa312134 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest255Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest255Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest255" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest256Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest256Filler.json
index d9a8ec101..f3ffc6f96 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest256Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest256Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest256" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest257Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest257Filler.json
index d085411bd..944b666b7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest257Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest257Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest257" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest258Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest258Filler.json
index 9d1179726..7125dd5b5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest258Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest258Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest258" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest259Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest259Filler.json
index 22520f063..e39d2a717 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest259Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest259Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest259" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest25Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest25Filler.json
index 65737bdea..b94eece70 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest25Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest25Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest25" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest260Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest260Filler.json
index 2bb145344..c6d3da76c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest260Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest260Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest260" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest261Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest261Filler.json
index 66fa64df5..568973a59 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest261Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest261Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest261" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest262Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest262Filler.json
index 3437fbee0..a331270ba 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest262Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest262Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest262" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest263Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest263Filler.json
index 1ce6bf077..412d52e84 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest263Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest263Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest263" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest264Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest264Filler.json
index fef1b886e..b1f9c5dd8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest264Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest264Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest264" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest265Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest265Filler.json
index 590c82e22..19bc22617 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest265Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest265Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest265" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest266Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest266Filler.json
index f511be8cf..147c8eeef 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest266Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest266Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest266" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest267Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest267Filler.json
index 7130c0884..13d0a28cf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest267Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest267Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest267" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest268Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest268Filler.json
index 7df63e969..00328d8fa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest268Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest268Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest268" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest269Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest269Filler.json
index 10afae775..3459319ab 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest269Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest269Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest269" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest26Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest26Filler.json
index 849a5678e..ca948b4e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest26Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest26Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest26" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x434242445b41310755",
                         "nonce" : "0",
                         "storage" : {
-                            "0x2e" : "0x01"
+                            "0x2e" : "0x03e8"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest270Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest270Filler.json
index d5459505b..fa93ad72b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest270Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest270Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest270" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest271Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest271Filler.json
index f0548841d..bd32e9583 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest271Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest271Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest271" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest272Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest272Filler.json
index 627849430..c801de8a4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest272Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest272Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest272" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest273Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest273Filler.json
index aebcaac5f..a37777185 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest273Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest273Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest273" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -17,7 +17,7 @@
                 },
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
-                    "0000000000000000000000000000000000000000" : {
+                    "0000000000000000000000000000000000000001" : {
                         "balance" : "1000000000000100000",
                         "code" : "0x",
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest274Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest274Filler.json
index bfa2e9a27..685f7f5db 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest274Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest274Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest274" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json
index c797f0379..441e595e0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest275Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest275" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest276Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest276Filler.json
index 7824e2369..49bdf4895 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest276Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest276Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest276" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest277Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest277Filler.json
index e4d87fbc6..b828e0d2b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest277Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest277Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest277" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest278Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest278Filler.json
index 0cab079e8..9c2b5b8a9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest278Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest278Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest278" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest279Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest279Filler.json
index 9b091eef3..0e09b769c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest279Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest279Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest279" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest27Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest27Filler.json
index a2042d49e..d594a17bd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest27Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest27Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest27" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest280Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest280Filler.json
index e656e0386..f1fe9c42c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest280Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest280Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest280" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest281Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest281Filler.json
index 0e739da00..c50b9c735 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest281Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest281Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest281" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest282Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest282Filler.json
index e49ac93ce..b8f916f07 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest282Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest282Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest282" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest283Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest283Filler.json
index 1f2dd96d1..56812e713 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest283Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest283Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest283" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest284Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest284Filler.json
index f0b85fbea..50305883f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest284Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest284Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest284" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest285Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest285Filler.json
index 448fe9bb4..e3adc7977 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest285Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest285Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest285" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "49568",
+                        "balance" : "49583",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999850478",
+                        "balance" : "999999999999850463",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest286Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest286Filler.json
index 61d02d39d..5bc8b7186 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest286Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest286Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest286" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest287Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest287Filler.json
index 2967ed17b..22a29c2d9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest287Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest287Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest287" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest288Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest288Filler.json
index b30cc1a3b..e9c728b90 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest288Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest288Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest288" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest289Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest289Filler.json
index 42d31e66d..4f3f614c4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest289Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest289Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest289" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest28Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest28Filler.json
index 628fb5e95..4c2e5ca81 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest28Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest28Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest28" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest290Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest290Filler.json
index 35df5bba1..ea4cae680 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest290Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest290Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest290" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest291Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest291Filler.json
index 0c36a564a..07b010338 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest291Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest291Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest291" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest292Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest292Filler.json
index 8b9433a41..c3646ec68 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest292Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest292Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest292" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest293Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest293Filler.json
index 80524f7b6..e5e882736 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest293Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest293Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest293" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest294Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest294Filler.json
index 00f8e47bd..1c07f6b64 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest294Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest294Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest294" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest295Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest295Filler.json
index 888b9e991..f86f7eeb5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest295Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest295Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest295" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest296Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest296Filler.json
index 6839ebb80..af569cb7d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest296Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest296Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest296" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest297Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest297Filler.json
index 39ede9f49..9271c55c4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest297Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest297Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest297" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest298Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest298Filler.json
index 3809a2594..505b52d56 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest298Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest298Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest298" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest299Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest299Filler.json
index b55fdd7d1..b3b54459e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest299Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest299Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest299" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest29Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest29Filler.json
index 7f6661e5a..5ac4ed4c9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest29Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest29Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest29" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest2Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest2Filler.json
index 46ecdd46c..79f78f715 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest2Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest2Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest2" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest300Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest300Filler.json
index 6e6d724a1..8cabe9625 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest300Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest300Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest300" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest301Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest301Filler.json
index 9dcad6e49..ef4b949e0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest301Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest301Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest301" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest302Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest302Filler.json
index ef0c36f2f..491aa4b7c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest302Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest302Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest302" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest303Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest303Filler.json
index ea24bb211..1846bbf05 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest303Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest303Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest303" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest304Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest304Filler.json
index c205006da..d47a5d9e0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest304Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest304Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest304" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest305Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest305Filler.json
index 90d896f2e..ea898390d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest305Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest305Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest305" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest306Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest306Filler.json
index 2ca98348b..e14e99ea9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest306Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest306Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest306" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest307Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest307Filler.json
index 48c42386c..7289244ce 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest307Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest307Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest307" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest308Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest308Filler.json
index 5e3cd012b..7db1a07be 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest308Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest308Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest308" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5357f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe427f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000010000000000000000000000000000000000000000085a01096630f38c9a60005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x30f38c9a600051" : "0x5cf23bf6ffffffffffffffff461b8812"
+                            "0x30f38c9a600051" : "0x000000000000000000000000000000005cf23fc6ffffffffffffffff461b8072"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json
index 4d5b03e03..45ad2bbbc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest309Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest309" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest30Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest30Filler.json
index 239c45ef5..64e66166a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest30Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest30Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest30" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest310Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest310Filler.json
index e1babc87b..47bc4dc22 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest310Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest310Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest310" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest311Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest311Filler.json
index d51499393..020d8e8f5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest311Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest311Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest311" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest312Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest312Filler.json
index 143c54b8b..9dd86e8b8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest312Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest312Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest312" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest313Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest313Filler.json
index 591de59f6..76ffc88ae 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest313Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest313Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest313" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest314Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest314Filler.json
index 5a3274d76..f6496b542 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest314Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest314Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest314" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest315Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest315Filler.json
index 832fe7bfe..b82a27cdf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest315Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest315Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest315" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest316Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest316Filler.json
index 8f8caf673..e36b41778 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest316Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest316Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest316" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest317Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest317Filler.json
index 8f98086b4..8fb5c6d82 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest317Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest317Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest317" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest318Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest318Filler.json
index 33862efd6..d134506d7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest318Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest318Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest318" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest319Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest319Filler.json
index b46edf1f9..e3ac91a2d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest319Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest319Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest319" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,19 @@
                         "code" : "0x44404243424142915a2055",
                         "nonce" : "0",
                         "storage" : {
-                            "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                            "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" : "0x00",
+			    "0xae72e2bf2302ebcd309e003e5be58830f96deddaf87bb89eeea159388bfe3ec1" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "350556",
+                        "balance" : "352271",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999549490",
+                        "balance" : "999999999999547775",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest31Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest31Filler.json
index d6da7a6ac..613bb7be1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest31Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest31Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest31" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest320Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest320Filler.json
index 5eaa77734..7d043d266 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest320Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest320Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest320" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest321Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest321Filler.json
index 83261b180..e0ead0e2f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest321Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest321Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest321" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest322Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest322Filler.json
index 0baeea4f5..0352c90db 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest322Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest322Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest322" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest323Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest323Filler.json
index 70a48ee93..9e982d927 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest323Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest323Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest323" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest324Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest324Filler.json
index bbf916ebf..45524c024 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest324Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest324Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest324" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest325Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest325Filler.json
index 237c79047..2075421d7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest325Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest325Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest325" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x437fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe81090360005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc18"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest326Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest326Filler.json
index f6d5ce7ad..803778667 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest326Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest326Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest326" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "113713443",
+                        "balance" : "113735807",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998307161690",
+                        "balance" : "999999998307139326",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest327Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest327Filler.json
index db3936f52..dab617609 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest327Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest327Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest327" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest328Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest328Filler.json
index c409f58b1..5a35cf974 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest328Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest328Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest328" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest329Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest329Filler.json
index f2ce284e3..f965878f9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest329Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest329Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest329" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest32Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest32Filler.json
index 4a5c29ed4..42b72901b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest32Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest32Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest32" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -18,21 +18,21 @@
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "1000000000000100000",
+                        "balance" : "1000000000000000000",
                         "code" : "0x434142433a424440f26f",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "30194",
+                        "balance" : "400046",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999869852",
+                        "balance" : "999999999999600000",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest330Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest330Filler.json
index 5302804e4..bb05edf16 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest330Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest330Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest330" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest331Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest331Filler.json
index c5650013a..85d97ecea 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest331Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest331Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest331" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,17 +22,18 @@
                         "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5067f0000000000000000000000000000000000000000000000000000000000000000407f000000000000000000000000000000000000000000000000000000000000c350427f00000000000000000000000000000000000000000000000000000000000000013a0960005155",
                         "nonce" : "0",
                         "storage" : {
+				"0x00" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "30179",
+                        "balance" : "45179",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998526983283",
+                        "balance" : "999999998526968283",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest332Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest332Filler.json
index b65e412ad..d12a95ae2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest332Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest332Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest332" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest333Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest333Filler.json
index d4eecd2db..b2b9bf5de 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest333Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest333Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest333" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest334Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest334Filler.json
index ac8d9b787..5bdc5f06d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest334Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest334Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest334" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest335Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest335Filler.json
index 049795180..9a06536f1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest335Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest335Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest335" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest336Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest336Filler.json
index 4f05b0bee..1e758e7b3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest336Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest336Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest336" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "49585",
+                        "balance" : "50059",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999850461",
+                        "balance" : "999999999999849987",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest337Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest337Filler.json
index 566a66f0d..214a6f385 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest337Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest337Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest337" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest338Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest338Filler.json
index 7a119ce63..b93299ab3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest338Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest338Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest338" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest339Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest339Filler.json
index a8cc0f98e..87d681436 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest339Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest339Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest339" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest33Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest33Filler.json
index d41d71503..59ad94eb9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest33Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest33Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest33" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json
index eb5f41a3e..297c5a81c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest340Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest340" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest341Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest341Filler.json
index c36edeb8e..9d29b6255 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest341Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest341Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest341" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest342Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest342Filler.json
index 2cb8eb2e1..9bf33b6dc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest342Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest342Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest342" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest343Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest343Filler.json
index a9127c47d..30a0d2068 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest343Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest343Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest343" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest344Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest344Filler.json
index fc7d63048..c83d2d674 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest344Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest344Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest344" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest345Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest345Filler.json
index af7a81132..5deff9f87 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest345Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest345Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest345" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json
index b9e2b43e7..d32f724c8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest346Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest346" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json
index cd279c2d6..e8b4999a5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest347Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest347" : {
         "env" : {
             "currentCoinbase" : "a7f7c8ef9bbbcfb0f7e81c1fd46bb732fba60592",
-            "currentDifficulty" : "0x4b7a57082929690e",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0b3be1fc",
-            "currentNumber" : "0x7ee23b32",
-            "currentTimestamp" : "0x588de6ec",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "f3907ec3d962d22b61d2618054c8252a7fe67b65f652a7b8fcc55cfe905a1caa"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest348Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest348Filler.json
index 9ef523f99..17c814771 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest348Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest348Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest348" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest349Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest349Filler.json
index 6442d6ced..021cf371d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest349Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest349Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest349" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -23,7 +23,8 @@
                         "nonce" : "0",
                         "storage" : {
                             "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
-                            "0x01" : "0x014f8b588e368f08461f9f01b866e43aa79bbadc0980b242070b8cfbfc6540"
+                            "0x01" : "0",
+			    "0x03e8" : "0x00014f8b588e368f08461f9f01b866e43aa79bbadc0980b242070b8cfbfc6540"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest34Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest34Filler.json
index 1f352fe60..59de269d3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest34Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest34Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest34" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x444140404242420555",
                         "nonce" : "0",
                         "storage" : {
-                            "0x01" : "0x01"
+                            "0x01" : "0x03e8"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json
index 6147e4366..3a01f0582 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest350Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest350" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,18 @@
                         "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff090860005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0x0475de7dd392"
+                            "0x00" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "51502",
+                        "balance" : "36502",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998365680472",
+                        "balance" : "999999998365695472",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest351Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest351Filler.json
index 44ba0a26c..810b3894a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest351Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest351Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest351" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest352Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest352Filler.json
index 7a3fd3f6b..ad46c561d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest352Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest352Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest352" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest353Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest353Filler.json
index ee86bd265..d1c83d5fe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest353Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest353Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest353" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest354Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest354Filler.json
index f90e7754a..9ad396501 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest354Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest354Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest354" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c350603b35641a8e739f86980a433760005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+                            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest355Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest355Filler.json
index e1e50e8aa..2ae63c6e7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest355Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest355Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest355" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest356Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest356Filler.json
index 7cc02abfb..352c9bb07 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest356Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest356Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest356" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest357Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest357Filler.json
index 0cec28569..d702b01b6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest357Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest357Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest357" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest358Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest358Filler.json
index 842380e55..5f54b639e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest358Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest358Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest358" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest359Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest359Filler.json
index b39da4097..fb0a56df3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest359Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest359Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest359" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest35Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest35Filler.json
index 16a85a1cf..c7e0446c1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest35Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest35Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest35" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest360Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest360Filler.json
index 87b11d3e2..efd4be8c2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest360Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest360Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest360" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest361Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest361Filler.json
index 77af0637b..65c6fefd3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest361Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest361Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest361" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest362Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest362Filler.json
index fc0cb56da..1d8a94c0a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest362Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest362Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest362" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest363Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest363Filler.json
index 7469eb32e..341d88ca5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest363Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest363Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest363" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest364Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest364Filler.json
index 9b43e922e..398e52520 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest364Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest364Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest364" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json
index 396babb47..4f9fd3ebd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest365Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest365" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,19 +22,19 @@
                         "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff42417f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000143b420785375560005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffff",
-                            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                            "0x00" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "82483",
+                        "balance" : "67767",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998780640409",
+                        "balance" : "999999998780655125",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest366Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest366Filler.json
index d3d5a74d3..d032c58a8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest366Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest366Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest366" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest367Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest367Filler.json
index c95e6a00d..3f341ac39 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest367Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest367Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest367" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000000447f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5447f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b51905810a6c7a5959339f3342838b5560005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x7a5959339f3342838b55600051" : "0x63d89f01abf9e43f8ce437b224222040fc6ee190188821bbd581f24d905261"
+                            "0x7a5959339f3342838b55600051" : "0x880ad67c991058b3847ec9f491f7a8d6ecbb1dff5c2326e7e8e9eb560ca29ecd"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest368Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest368Filler.json
index 565ddf705..1b9e94b18 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest368Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest368Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest368" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -18,7 +18,7 @@
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                        "balance" : "1135359123",
+                        "balance" : "1135358124",
                         "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe097f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54206f06d870339356057907760005155",
                         "nonce" : "1",
                         "storage" : {
@@ -39,7 +39,7 @@
                         }
                     },
                     "d2571607e241ecf590ed94b12d87c94babe36db6" : {
-                        "balance" : "1",
+                        "balance" : "1000",
                         "code" : "0x",
                         "nonce" : "0",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest369Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest369Filler.json
index 92deacef0..bfef7619b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest369Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest369Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest369" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest36Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest36Filler.json
index d3e9fd6d5..046621376 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest36Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest36Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest36" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest370Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest370Filler.json
index 17013d805..e12f0aed0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest370Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest370Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest370" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest371Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest371Filler.json
index b1d1c8d6d..9dcb819ee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest371Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest371Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest371" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest372Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest372Filler.json
index a0ee0d51f..7b466c3ac 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest372Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest372Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest372" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest373Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest373Filler.json
index 98c595be6..21e48b0bf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest373Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest373Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest373" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest374Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest374Filler.json
index 8a0816b63..bacc4ae1e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest374Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest374Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest374" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest375Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest375Filler.json
index 2ad925b84..1c5ccb7f2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest375Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest375Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest375" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x414542084255",
                         "nonce" : "0",
                         "storage" : {
-                            "0x01" : "0x8000000000000000"
+                            "0x01" : "0x00",
+			    "0x03e8" : "0x00000000000000000000000000000000000000000000000080000000000003e7"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest376Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest376Filler.json
index 56e837d78..8c3a74c47 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest376Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest376Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest376" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest377Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest377Filler.json
index a5937d926..7ffecf488 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest377Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest377Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest377" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x41444442444441450855",
                         "nonce" : "0",
                         "storage" : {
-                            "0x03aace415245" : "0x051d6a3cd647"
+                            "0x03aace415245" : "0x00",
+			    "0x71b4" : "0x0000000000000000000000000000000000000000000000000000000000020000"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest378Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest378Filler.json
index 46f3a1da9..cba28c052 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest378Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest378Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest378" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest379Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest379Filler.json
index 9578e8829..a08d8888c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest379Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest379Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest379" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,8 @@
                         "code" : "0x424255",
                         "nonce" : "0",
                         "storage" : {
-                            "0x01" : "0x01"
+                            "0x01" : "0x00",
+			    "0x3e8" : "0x00000000000000000000000000000000000000000000000000000000000003e8"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest37Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest37Filler.json
index 659f79889..05ca36e73 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest37Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest37Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest37" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest380Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest380Filler.json
index 1d44aae7b..4efd4cfcd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest380Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest380Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest380" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest381Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest381Filler.json
index 9acb95f2b..626a28653 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest381Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest381Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest381" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest382Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest382Filler.json
index 19d5faf0b..75ee5e3d8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest382Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest382Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest382" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest383Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest383Filler.json
index f7fcf9711..a3d13b994 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest383Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest383Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest383" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json
index adc7db840..cd981903b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest384" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json
index cf8252b3d..d188464c3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest385" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json
index 6fe8dc3a3..ed3cbca7a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest386" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json
index 3f572a30d..14335eba2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest387" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json
index 555aad469..0fb6bcc80 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest388" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json
index a2d76cf56..76be4ab4d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest389" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest38Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest38Filler.json
index b81e2cacf..3a5e9fb94 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest38Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest38Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest38" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest390Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest390Filler.json
index e0d1d111c..92c3e0008 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest390Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest390Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest390" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json
index 16bd2c0e2..4a9fb3964 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest391" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "23039",
+                        "balance" : "31126",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999877007",
+                        "balance" : "999999999999868920",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest392Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest392Filler.json
index 5740a2014..2e6c142ba 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest392Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest392Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest392" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x424061434444413155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x2e" : "0x051d6a3cd647"
+                            "0x2e" : "0x0000000000000000000000000000000000000000000000000000000000020000"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json
index e75364956..b6191d83d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest393" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest394Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest394Filler.json
index fc14593e1..0fc6a501d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest394Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest394Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest394" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json
index 4755001bf..a71def821 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest395" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json
index c2ed3c625..29ad3888c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest396" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json
index 9f66731cb..ca9bad4b7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest397" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "49568",
+                        "balance" : "49583",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999850478",
+                        "balance" : "999999999999850463",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json
index 207a9f07a..92fca734c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest398" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json
index f83e120e3..0a085fb6d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest399" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest39Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest39Filler.json
index 3d64a3c10..d8a3c03cc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest39Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest39Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest39" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest3Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest3Filler.json
index 1f8f32b3e..206431cb7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest3Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest3Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest3" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest400Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest400Filler.json
index aa798018d..7a85a37a8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest400Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest400Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest400" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json
index ae1ced0ff..9a9409c4a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest401" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json
index 3476e0d45..2d7f42777 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest402" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest403Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest403Filler.json
index 6ccd2dc44..a99269fa3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest403Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest403Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest403" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -26,14 +26,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "41235",
+                        "balance" : "41555",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999858811",
+                        "balance" : "999999999999858491",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json
index 4ca43734b..d61e7c60e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest404" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json
index db67b3ee7..51b498a10 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest405" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json
index 93ac20a3d..e7523e568 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest406" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json
index 3a9e09c7c..fc849c2b9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest407" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json
index f3aa42939..dfb3bd4f0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest408" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json
index 61baeccd4..652ab7f44 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest409" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest40Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest40Filler.json
index 788d2baa3..a488ca465 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest40Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest40Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest40" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json
index 977d6b636..49e0b3ac4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest410" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json
index c668d63b6..6b05d2891 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest411" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json
index aa29fe6d3..39f52543a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest412" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json
index 4c8132b41..099fba32c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest413" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json
index b1d6db915..497315de8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest414" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json
index 11b795580..db5b52d47 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest415" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "589478",
+                        "balance" : "589831",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998764114051",
+                        "balance" : "999999998764113698",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json
index 063b0ed3b..1867b6081 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest416" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,7 +22,7 @@
                         "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff427f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b54355",
                         "nonce" : "0x00",
                         "storage" : {
-                            "0x00" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
+                            "0x01" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json
index 4f9ff23ef..b865ec0e8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest417" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -25,14 +25,14 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "30174",
+                        "balance" : "72948",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999999999869872",
+                        "balance" : "999999999999827098",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json
index 413d6a804..748642f56 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest418" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json
index 3cdb2dad3..72a83fc15 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest419" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest41Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest41Filler.json
index 9d022584d..2673e2d4c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest41Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest41Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest41" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json
index e7e661e54..5ecaf43f8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest420" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json
index 93fcb6f44..b5b443dc4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest421" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json
index 8a27bef05..985412ff7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest422" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json
index a5831790c..22fca7265 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest423" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json
index a072c85f8..7a4f30b7a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest424" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json
index d1ce5b1f9..00f84387a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest425" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json
index 765804458..f13b85a2c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest426" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest427Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest427Filler.json
index 23fb4f71f..9e33cf028 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest427Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest427Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest427" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json
index a11d56c99..a856e6ee8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest428" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json
index 2ffef4d9f..b8593593a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest429" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json
index 1ee59f3e3..e16d67db4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest42Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest42" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "0x051d6a3cd647",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json
index abf8f9299..77ab053aa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest430" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest431Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest431Filler.json
index 86d84f015..ea9d33512 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest431Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest431Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest431" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest432Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest432Filler.json
index 19de07a25..f079470f3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest432Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest432Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest432" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json
index 6833b65db..fad702386 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest433" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest434Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest434Filler.json
index 64f0404c2..9933270b1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest434Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest434Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest434" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json
index 3278d1531..51cbdf443 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest435" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,19 @@
                         "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000000447ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000042613488076233797f553960005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+                            "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
+			    "0x33797f" : "0x00000000000000000000000000000000000000000000000000000000000001c0"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "64533",
+                        "balance" : "79533",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998743767043",
+                        "balance" : "999999998743752043",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json
index 5f2d5c425..1b9e750d9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest436" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json
index 666628987..cafc7f264 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest437" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -22,18 +22,19 @@
                         "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000013a1339085560005155",
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+                            "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe",
+			    "0x6bacfb1469f9a4d5674a85b75f951d72d7a58e4b" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "balance" : "51393",
+                        "balance" : "66393",
                         "code" : "0x6000355415600957005b60203560003555",
                         "nonce" : "0",
                         "storage" : {
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                        "balance" : "999999998247534186",
+                        "balance" : "999999998247519186",
                         "code" : "0x",
                         "nonce" : "1",
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json
index afd7e7726..383f84ea9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest438" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json
index 520777e54..126bdfd14 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest439" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest43Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest43Filler.json
index e7b5ada21..9abd56573 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest43Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest43Filler.json
@@ -2,10 +2,10 @@
     "randomStatetest43" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
-            "currentDifficulty" : "5623894562375",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json
index 7ce617fcf..56a9a579a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json
author	Dimitry <dimitry@ethdev.com>	2017-02-08 05:34:45 +0800
committer	Dimitry <dimitry@ethdev.com>	2017-02-10 02:24:55 +0800
commit	86e11be43aecf360a8d5f16edecfa7b378081fb9 (patch)
tree	fa403ffaf2e92a9d373c8bb90e57c178af7e87c1 /src
parent	7cb53c1950ee7c0101c62028bacabfcd2761bd46 (diff)
download	dexon-tests-86e11be43aecf360a8d5f16edecfa7b378081fb9.tar.gz dexon-tests-86e11be43aecf360a8d5f16edecfa7b378081fb9.tar.zst dexon-tests-86e11be43aecf360a8d5f16edecfa7b378081fb9.zip