update general state tests fillers to suite blockchain

65 files changed, 195 insertions, 195 deletions

diff --git a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
index 47e42210e..1f82713bf 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
@@ -2,10 +2,10 @@
     "calldatacopy_dejavu2 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
index 7065c7ae5..e2b750212 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
@@ -2,10 +2,10 @@
     "calldatacopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
index 8767feb01..b2199ab54 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
@@ -2,10 +2,10 @@
     "codecopy_dejavu2 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
index e7596eb83..e1d238411 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
@@ -2,10 +2,10 @@
     "codecopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
index cfad7a98e..b404226fd 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
@@ -2,10 +2,10 @@
     "extcodecopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
index 5c5c4a03d..0984d539b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
@@ -2,10 +2,10 @@
     "log1_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
index 4fda109ce..0df2b407b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
@@ -2,10 +2,10 @@
     "log2_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
index e7cf23b9a..9d7ede3cf 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
@@ -2,10 +2,10 @@
     "log3_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
index cdd9ce935..487af298d 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
@@ -2,10 +2,10 @@
     "log4_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
index 1a6ed14e4..baabf229a 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
@@ -2,10 +2,10 @@
     "mem0b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
index 74440f1f4..3d2d3f4e0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
@@ -2,10 +2,10 @@
     "mem31b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
index fb8393b40..932c13305 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
@@ -2,10 +2,10 @@
     "mem32b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
index 1979fd95d..28e603515 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
@@ -2,10 +2,10 @@
     "mem32kb+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
index b208e4a72..fc46a7f98 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
@@ -2,10 +2,10 @@
     "mem32kb+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
index aec230294..d0e09afdc 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
@@ -2,10 +2,10 @@
     "mem32kb+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
index 81c4d8f97..9488c8aec 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
@@ -2,10 +2,10 @@
     "mem32kb+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
index 7947887d1..e8d6dc90a 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
@@ -2,10 +2,10 @@
     "mem32kb-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
index 84a434ac2..43bed08a6 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
@@ -2,10 +2,10 @@
     "mem32kb-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
index 6069ae170..da1f6f22c 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
@@ -2,10 +2,10 @@
     "mem32kb-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
index 2dac15598..6f59b8121 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
@@ -2,10 +2,10 @@
     "mem32kb-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
index d05d70606..b3d5b32ea 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
@@ -2,10 +2,10 @@
     "mem32kb " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
index 06e920167..2570cc093 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
index ac223745d..1c4e8b422 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
index f8f4cbe20..2f5534508 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
index 06f24fa71..22c36bf80 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
index eed3fde75..be7bfbf45 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
index c0f1d90cd..a41c9899e 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
index 4bf68479a..13d403f38 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
index cd2cf9937..835c9ba70 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
index a0682f6c4..e85cb8a3a 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
index 02fa1de8b..2ce110392 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
@@ -2,10 +2,10 @@
     "mem33b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
index 14b12f693..8b3d71564 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
@@ -2,10 +2,10 @@
     "mem64kb+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
index 2cf152036..6807bca5a 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
@@ -2,10 +2,10 @@
     "mem64kb+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
index 40ac928e9..7acf98554 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
@@ -2,10 +2,10 @@
     "mem64kb+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
index e6285fdca..e5c8b8de4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
@@ -2,10 +2,10 @@
     "mem64kb+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
index 2acbba53c..8a9b354e7 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
@@ -2,10 +2,10 @@
     "mem64kb-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
index 88f534596..5734d3246 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
@@ -2,10 +2,10 @@
     "mem64kb-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
index 0b6750f2f..42b085e4f 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
@@ -2,10 +2,10 @@
     "mem64kb-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
index f4238c050..07f657372 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
@@ -2,10 +2,10 @@
     "mem64kb-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
index 422a98609..d22768990 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
@@ -2,10 +2,10 @@
     "mem64kb " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
index 9d0e5def3..af94f17a4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
index 300883252..165222eb2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
index ee2f5c1e7..246db89e3 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
index 7de76e777..c5868e2d0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
index 71a8291eb..8919f4eda 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
index 11bc5212b..9961cc509 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
index 41e579cae..c5f8b5b30 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
index 7677870f0..6820d5574 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
index 7260fe7b6..ade129f55 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
index a79d21db8..5b15b0622 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
@@ -2,10 +2,10 @@
     "memReturn " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
index 519015b8b..c47f55552 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
@@ -2,10 +2,10 @@
     "mload16bitBound " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "17592320524892",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
index 368910bf4..a9ec1f304 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
@@ -2,10 +2,10 @@
     "mload8bitBound " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
index 79791108b..4588ebbe9 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
@@ -2,10 +2,10 @@
     "mload_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
index 9c5b89159..e250ee91e 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
@@ -2,10 +2,10 @@
     "mstore_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
index 1693f609f..c7f81e79e 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
@@ -2,10 +2,10 @@
     "mstroe8_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
index 3da1f2e28..e2fb252fe 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
@@ -2,10 +2,10 @@
     "sha3_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
index b07b65f3d..e569370ea 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
index abd74c812..ceecf6962 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
index 3194b41df..0964150b2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
index 30dfa7364..943bc30d5 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
index bea58a042..e6a819b8d 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
index bf8abc978..90875b6a4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
index 26196ff59..3a7cbf0ba 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
index f1226cdc4..854c4f220 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
index 5f9177b47..f04b25445 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "42949672960",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [