refill general state tests

65 files changed, 195 insertions, 195 deletions

diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
index 1613469ce..8a1cde547 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
@@ -2,10 +2,10 @@
     "calldatacopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
index 90515602d..9baa6979e 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
@@ -2,10 +2,10 @@
     "calldatacopy_dejavu2 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
index 2b3f70ecf..7916561f5 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
@@ -2,10 +2,10 @@
     "codecopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
index 7fedc0783..2f7f9ba42 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
@@ -2,10 +2,10 @@
     "codecopy_dejavu2 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
index 6facfdfdd..3f5fa4bc5 100644
--- a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
@@ -2,10 +2,10 @@
     "extcodecopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log1_dejavu.json b/GeneralStateTests/stMemoryTest/log1_dejavu.json
index 532f37690..6f8276db9 100644
--- a/GeneralStateTests/stMemoryTest/log1_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log1_dejavu.json
@@ -2,10 +2,10 @@
     "log1_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log2_dejavu.json b/GeneralStateTests/stMemoryTest/log2_dejavu.json
index 49dedc086..3f7ec926a 100644
--- a/GeneralStateTests/stMemoryTest/log2_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log2_dejavu.json
@@ -2,10 +2,10 @@
     "log2_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log3_dejavu.json b/GeneralStateTests/stMemoryTest/log3_dejavu.json
index 9753d6629..fc724e607 100644
--- a/GeneralStateTests/stMemoryTest/log3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log3_dejavu.json
@@ -2,10 +2,10 @@
     "log3_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log4_dejavu.json b/GeneralStateTests/stMemoryTest/log4_dejavu.json
index 9a6194ba6..2798aac14 100644
--- a/GeneralStateTests/stMemoryTest/log4_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log4_dejavu.json
@@ -2,10 +2,10 @@
     "log4_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
index e71eadd61..ffb90ff74 100644
--- a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
@@ -2,10 +2,10 @@
     "mem0b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
index 52b4821a9..9659f7ddb 100644
--- a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
@@ -2,10 +2,10 @@
     "mem31b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
index e07f062aa..eacd3e459 100644
--- a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
@@ -2,10 +2,10 @@
     "mem32b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+1.json b/GeneralStateTests/stMemoryTest/mem32kb+1.json
index 9880a34a3..bc0d656b0 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+1.json
@@ -2,10 +2,10 @@
     "mem32kb+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+31.json b/GeneralStateTests/stMemoryTest/mem32kb+31.json
index ef0c1f9a2..2f264ef92 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+31.json
@@ -2,10 +2,10 @@
     "mem32kb+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+32.json b/GeneralStateTests/stMemoryTest/mem32kb+32.json
index f63a46b2b..a5df35f6f 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+32.json
@@ -2,10 +2,10 @@
     "mem32kb+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+33.json b/GeneralStateTests/stMemoryTest/mem32kb+33.json
index 0ba3c4175..8e524a44a 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+33.json
@@ -2,10 +2,10 @@
     "mem32kb+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-1.json b/GeneralStateTests/stMemoryTest/mem32kb-1.json
index 7ed6be171..659ee3759 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-1.json
@@ -2,10 +2,10 @@
     "mem32kb-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-31.json b/GeneralStateTests/stMemoryTest/mem32kb-31.json
index 730ce6832..8bd8ed559 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-31.json
@@ -2,10 +2,10 @@
     "mem32kb-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json
index 48d88fddd..8689699e7 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json
@@ -2,10 +2,10 @@
     "mem32kb-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-33.json b/GeneralStateTests/stMemoryTest/mem32kb-33.json
index 4482ce6ce..2f2230bfd 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-33.json
@@ -2,10 +2,10 @@
     "mem32kb-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb.json b/GeneralStateTests/stMemoryTest/mem32kb.json
index 23e43f599..f7c3d212f 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb.json
@@ -2,10 +2,10 @@
     "mem32kb " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
index 0ed8f4f5b..dae21a4c5 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
index 868725bfe..4a0bcccb2 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
index 6cfac0fa8..090f0dd74 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
index 327178251..ee2cdc513 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
index f2c2a41d5..311955572 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
index 985f76703..163162a3c 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
index 89654a4a1..d7eaeab7c 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
index 4ed02e845..2a156b098 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
index 82ce619c7..f8e99e953 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
index 2a2c3ea82..a572f4693 100644
--- a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
@@ -2,10 +2,10 @@
     "mem33b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+1.json b/GeneralStateTests/stMemoryTest/mem64kb+1.json
index 0bec3862d..c247dd7cc 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+1.json
@@ -2,10 +2,10 @@
     "mem64kb+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+31.json b/GeneralStateTests/stMemoryTest/mem64kb+31.json
index 68a619eae..6d1052b48 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+31.json
@@ -2,10 +2,10 @@
     "mem64kb+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+32.json b/GeneralStateTests/stMemoryTest/mem64kb+32.json
index 8246e504e..386de79eb 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+32.json
@@ -2,10 +2,10 @@
     "mem64kb+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+33.json b/GeneralStateTests/stMemoryTest/mem64kb+33.json
index dcf73418f..f701899c3 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+33.json
@@ -2,10 +2,10 @@
     "mem64kb+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-1.json b/GeneralStateTests/stMemoryTest/mem64kb-1.json
index 11d4f3fde..7f41b0939 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-1.json
@@ -2,10 +2,10 @@
     "mem64kb-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-31.json b/GeneralStateTests/stMemoryTest/mem64kb-31.json
index 36e4fc5fd..97634c774 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-31.json
@@ -2,10 +2,10 @@
     "mem64kb-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-32.json b/GeneralStateTests/stMemoryTest/mem64kb-32.json
index 46ec435b5..a084b9213 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-32.json
@@ -2,10 +2,10 @@
     "mem64kb-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-33.json b/GeneralStateTests/stMemoryTest/mem64kb-33.json
index 2e8853c7c..e0afc6d83 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-33.json
@@ -2,10 +2,10 @@
     "mem64kb-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb.json b/GeneralStateTests/stMemoryTest/mem64kb.json
index 43d2cb75c..0c51f7bbe 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb.json
@@ -2,10 +2,10 @@
     "mem64kb " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
index cebb3a9f9..5fbbfb3dc 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
index cb78fb298..4337dbde5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
index 26a8663eb..2fb8f977e 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
index 3ec53dd11..5029caacb 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
index 4dd3482a9..73d62f34c 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
index 17c69caa3..586074dc9 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
index 55c8a7f60..4d6750987 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
index 1549db222..2eb749246 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
index 4e25eaadc..cebc30a75 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/memReturn.json b/GeneralStateTests/stMemoryTest/memReturn.json
index c61fef62e..5ff2951ed 100644
--- a/GeneralStateTests/stMemoryTest/memReturn.json
+++ b/GeneralStateTests/stMemoryTest/memReturn.json
@@ -2,10 +2,10 @@
     "memReturn " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mload16bitBound.json b/GeneralStateTests/stMemoryTest/mload16bitBound.json
index d7170e33b..056ac5314 100644
--- a/GeneralStateTests/stMemoryTest/mload16bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload16bitBound.json
@@ -2,10 +2,10 @@
     "mload16bitBound " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x10000804025c",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mload8bitBound.json b/GeneralStateTests/stMemoryTest/mload8bitBound.json
index 03335491c..0589f027d 100644
--- a/GeneralStateTests/stMemoryTest/mload8bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload8bitBound.json
@@ -2,10 +2,10 @@
     "mload8bitBound " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mload_dejavu.json b/GeneralStateTests/stMemoryTest/mload_dejavu.json
index efc77d3d1..a986e4210 100644
--- a/GeneralStateTests/stMemoryTest/mload_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mload_dejavu.json
@@ -2,10 +2,10 @@
     "mload_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mstore_dejavu.json b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
index e31e8609b..2ee722a70 100644
--- a/GeneralStateTests/stMemoryTest/mstore_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
@@ -2,10 +2,10 @@
     "mstore_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
index 93fb9052a..7db116336 100644
--- a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
@@ -2,10 +2,10 @@
     "mstroe8_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/sha3_dejavu.json b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
index f5ef8718e..644d6a9aa 100644
--- a/GeneralStateTests/stMemoryTest/sha3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
@@ -2,10 +2,10 @@
     "sha3_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
index ea2be8891..87eef5fe9 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
index 01f5da6d2..cf8941078 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
index e5ab6d801..2e1450e8a 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
index 4174c3a68..ce06581de 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
index bb7386919..fdcafa6fd 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
index 5d85ad291..3f044b3dd 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
index b1c514452..6cf8cb7ab 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
index 891ae7f5b..fe0b7cb19 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
index 16cf97dfe..7b8796c20 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {