correct Vitalik's test fillers env info

224 files changed, 1030 insertions, 1030 deletions

diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json
index b745b6687..14d7edd0d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json
@@ -1,12 +1,12 @@
 {
     "ecadd_0-0_0-0_21000_0": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
-            "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
+            "previousHash": "c6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
             "24143873e0e0815fdcbcffdbe09c979cbf9ad013": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json
index a98746781..626a00dd4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json
index 477be90a9..7962a9e78 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_21000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json
index 60b954651..39d679cba 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json
@@ -1,12 +1,12 @@
 {
     "ecadd_0-0_0-0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
-            "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
+            "previousHash": "c6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
             "24143873e0e0815fdcbcffdbe09c979cbf9ad013": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json
index 02a14e6f9..4037d90a0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json
index d911b0acd..36ded653f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_25000_0": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json
index 41c9cb173..aedfa5e7f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json
index e78a93a7d..0f93f1c8c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_25000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json
index c119d75e9..477c8ac39 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_25000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json
index dfcc32f02..73834c731 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_0-0_25000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json
index 31dd3cba2..d4c81d640 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_1-2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json
index ce0e306e7..98006e40c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_1-2_21000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json
index 67af1314f..d2c19fe8c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_1-2_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json
index fd590ec79..41955ddf1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_1-2_25000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json
index 36aa2150a..8832e3679 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_1-3_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json
index 347667b30..bb27f095b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-0_1-3_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json
index ff8d82cce..2e53e8615 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-3_1-2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json
index 7b593fabc..e3f9c72fc 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_0-3_1-2_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json
index bd403dc5d..e5093d241 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_0-0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json
index 44faeed86..ec7aaa30f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_0-0_21000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json
index 9be0c450b..5b0ffcdab 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_0-0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json
index 60a568b84..c7c06e078 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_0-0_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json
index c76b47e49..18174bbcf 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_0-0_25000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json
index 404a9c812..525a01dda 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_0-0_25000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json
index 904652c6b..9029f7757 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_1-2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json
index 86a3468d8..a2c7254e2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_1-2_21000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json
index 296fe190c..9e1f6f89e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_1-2_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json
index 595fee2aa..6356e5d7c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-2_1-2_25000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json
index 466bc3d42..4d48ba7b6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-3_0-0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json
index aab4e20ee..b944ab817 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_1-3_0-0_25000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json
index 377e8383c..decfebea8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_10744596414106452074759370245733544594153395043370666422502510773307029471145-848677436511517736191562425154572367705380862894644942948681172815252343932_10744596414106452074759370245733544594153395043370666422502510773307029471145-21039565435327757486054843320102702720990930294403178719740356721829973864651_21000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json
index 0c0983e05..639f03dc7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_10744596414106452074759370245733544594153395043370666422502510773307029471145-848677436511517736191562425154572367705380862894644942948681172815252343932_10744596414106452074759370245733544594153395043370666422502510773307029471145-21039565435327757486054843320102702720990930294403178719740356721829973864651_25000_192": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json
index 538ee61b9..2c465de8d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_10744596414106452074759370245733544594153395043370666422502510773307029471145-848677436511517736191562425154572367705380862894644942948681172815252343932_1624070059937464756887933993293429854168590106605707304006200119738501412969-3269329550605213075043232856820720631601935657990457502777101397807070461336_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json
index df80921ef..b7b888369 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_10744596414106452074759370245733544594153395043370666422502510773307029471145-848677436511517736191562425154572367705380862894644942948681172815252343932_1624070059937464756887933993293429854168590106605707304006200119738501412969-3269329550605213075043232856820720631601935657990457502777101397807070461336_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json
index 7023381ae..efddc2359 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_6-9_19274124-124124_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json
index 62a9343f9..a675e3b34 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecadd_6-9_19274124-124124_25000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json
index 9f57dceb8..8b46a8424 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_21000_0": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json
index 7ac536e70..4b0c33cc0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json
index 0836616aa..9941cee38 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_21000_40": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json
index f56c21c2f..e8845c54e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json
index c672251e2..01c0f1ca7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json
index c2ce64d9f..c96791f30 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json
index 9669886c5..e8c881de4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_28000_0": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json
index e7538698d..9d0b5b4bc 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json
index dd56f6255..6d12c3b68 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_28000_40": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json
index 8279f7cac..4fb12f427 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_28000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-0_0_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json
index 6264feebb..3d8379ae7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_0_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128Filler.json
index ee2e64aa8..12614355d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -283,11 +283,11 @@
     },
     "ecmul_1-2_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json
index bc335d455..a82a5cecd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_1_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json
index 46224ace0..4f80f7d78 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_1_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json
index 5b5a1f16b..f9ac74ecd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_1_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-2_1_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json
index ecf136565..ad8b1b43e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json
index 84ce7dfe3..0f1180096 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_2_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json
index e5a93c6a4..cec3aaac3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_2_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-2_2_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
index a9f295841..cbcfa4cbd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_340282366920938463463374607431768211456_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
index 5b641040b..3d23bf942 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_340282366920938463463374607431768211456_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
index dc9afaae2..d1162f74e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_340282366920938463463374607431768211456_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
index be36fa636..17a1967a9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_340282366920938463463374607431768211456_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-2_340282366920938463463374607431768211456_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
index 66c1900a4..857d6757c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_340282366920938463463374607431768211456_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-0_340282366920938463463374607431768211456_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json
index 57d6b1616..dd3f8fe01 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json
index 46a404ecd..6c0ed1445 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json
index 56edc73c8..5c424510b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json
index 80485cede..6f6cf3d8d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json
index 00a461a5d..3744d448e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json
index 79eda34e0..f8d0f0ee4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json
index f495e6d61..a465124f4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json
index 34a005a79..1c58eb446 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json
index 03e55a927..05e0c978e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json
index fdefcb643..baa57513f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json
index 674d8ff22..759b91828 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_9_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json
index de1dc6986..5b8128341 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_9_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json
index cdf3e5159..a6b43b70c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-0_9_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json
index 9a2f82437..a4f12de0f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json
index 44fb38ac5..2949deb3b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json
index 844a7a309..d185f7f10 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json
index 8ca5b86a2..4e581edca 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_0_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json
index 737c1c8ab..619cb0f77 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_0_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-3_0_28000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json
index 0b7d9d50a..e0916ef37 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_0_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-0_1_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json
index f3d83cf6e..da418b246 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_1_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json
index be8303778..1430ef5a7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_1_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json
index 1bdd60571..98509eb64 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_1_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-0_2_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json
index 775d46b45..7cbfa69ae 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json
index 72279a0c9..f5d174163 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_2_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json
index c269a61ed..329fb1577 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_2_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-3_2_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -573,11 +573,11 @@
     },
     "ecmul_0-0_9_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
index e01abe717..85c13cda9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_340282366920938463463374607431768211456_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
index 198b17f20..75cdba507 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_340282366920938463463374607431768211456_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
index 13488a0ae..aa83ab561 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_340282366920938463463374607431768211456_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
index eb080f35a..0d66d22f7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_340282366920938463463374607431768211456_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-0_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
index 793358cdb..335829181 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_340282366920938463463374607431768211456_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-3_340282366920938463463374607431768211456_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json
index 453504232..f7f4ae3cd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json
index 0d55c5778..b9b4c66bb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json
index f8571f4fc..31a9d5cda 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json
index e3bcd6140..743bac2ae 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json
index 2ef71e513..991ea4e61 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json
index e59875e92..7f3eb5739 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json
index 69368122e..8d85d3dce 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json
index d0ff37f7f..3def78bb2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json
index 9cd6d8467..e06741bf3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -283,11 +283,11 @@
     },
     "ecmul_0-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json
index 548826a76..e2ff6096c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json
index beac38885..79fecda1c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json
index 37db94395..c033e2dd4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_9_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json
index 88c8b113f..d5b4cd605 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_9_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json
index f3368be83..dd5f01d63 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_0-3_9_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-3_9_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json
index 006e20759..5fa4bce0e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json
index a02340ead..b753f8fed 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json
index c11186906..6a38e1a13 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json
index 59b01078a..c8da54975 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json
index eed865df7..c31599cd9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json
index 4385e9ce4..0a1f75702 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_28000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json
index eded57729..10a9e5a87 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json
index 0bce4e7c1..1dadb18b1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_0_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json
index 3eb514a87..97276cd6f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_1_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json
index 4116d2610..5744ed51e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_1_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json
index 6223d8bbc..2624b0110 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_1_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_1_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json
index 8933de255..35ad6aa06 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json
index 06f9218b1..339757ad8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_2_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json
index 5f4f11420..555f0eb76 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_2_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json
index 222cd8503..b74d0bc5e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_340282366920938463463374607431768211456_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json
index cca798e2e..be593fe4b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_340282366920938463463374607431768211456_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json
index 35d855307..9cdfb0c24 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_340282366920938463463374607431768211456_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json
index 380cf31f6..cff947787 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_340282366920938463463374607431768211456_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-2_340282366920938463463374607431768211456_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json
index 93f128946..20a216a4d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json
index 7bd19dc21..cc9b92aa2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json
index 72bef7280..0567f3af0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json
index b718a97da..0cf6d61b8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -283,11 +283,11 @@
     },
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json
index 9c357e6e4..e238cf325 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json
index caef3dd6b..2ba2b35c3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json
index d0ef8a553..b93af3fe0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json
index 506b2e80d..b9d5c9203 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -283,11 +283,11 @@
     },
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json
index a73890add..673d4ae59 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json
index 6fd7d0ac0..083d5a798 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json
index d5334889c..9004d607f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_9_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json
index ce209ebc4..61657d5d6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_9_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json
index c534bd6b0..f72a6127d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-2_9_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-2_9_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json
index 549f0d4fb..0ab315551 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json
index 8c369ba4d..129a5994f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json
index 5094a9764..3c19fbf44 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json
index 8ea1420bb..b1b28c07a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_0_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json
index f31395f50..82851e8e4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_0_28000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_80Filler.json
index 54a5b2a5f..38485c994 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_0_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-3_0_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json
index 649d04213..1467accf5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "cmul_1-3_0_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-3_0_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json
index a099812cb..5c9e96c72 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_1_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json
index 7320737f7..2b43db49d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_1_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json
index c11eb8358..8c268dc4d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_1_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_0-3_1_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json
index 81237b4e2..6532b336e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json
index cad82f1d3..bd09e9ec8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_2_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json
index 825cb4e0d..7dd9c924d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_2_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-3_2_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json
index adf8d22c5..a2ba4c6d5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_340282366920938463463374607431768211456_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json
index dfc0b6dfc..b93b5790c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_340282366920938463463374607431768211456_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json
index 2d1d08792..d39248f5e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_340282366920938463463374607431768211456_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json
index 66a294064..ae5b9d2fb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_340282366920938463463374607431768211456_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-3_340282366920938463463374607431768211456_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json
index aa62f3b33..cb7c47e67 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json
index 9c72986e8..fc6e22965 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json
index fac88dc5f..031c22e7d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json
index b525b54c5..3faf121f6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json
index 25834b117..64fce52e5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json
index 7f49e06b0..9ca3298be 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json
index c86defd43..cb0e2ddb5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json
index 9f398aa1b..a8d535131 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json
index 4a5aaf36d..063314d08 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json
index 198c5521d..ab5f5b647 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json
index d22edbf75..ba8295c8c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_9_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json
index 5b816f9b3..a016b7132 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_9_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json
index 29ab91fea..658075d16 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_9_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json
index 2fad9e156..782867f8d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_1-3_9_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json
index 3152d3a52..af1ecc754 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json
index 89b863cb1..a78d316cb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_21000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json
index d1eeeb8d9..4c359a640 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json
index 47acc9c77..7db0a2de8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json
index 0d7724d1d..c134b8194 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_28000_64": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json
index 96f452695..c9fc5c4af 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json
index 5a5b3c0d2..3708fed7b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_0_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json
index b0795f3a6..ab986bde3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_340282366920938463463374607431768211456_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json
index 545d7a03a..82939b73f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_340282366920938463463374607431768211456_21000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json
index f16e7ce88..9c7adf8c8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_340282366920938463463374607431768211456_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json
index a3cca32ec..2fe392b46 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_340282366920938463463374607431768211456_28000_80": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-3_340282366920938463463374607431768211456_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json
index a41c46cea..44a7b90a9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_340282366920938463463374607431768211456_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_340282366920938463463374607431768211456_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json
index 32a924ea9..c3384d27d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_1_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json
index 1be865bd5..01a771855 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_1_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json
index b230df205..2d8b6f90f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_1_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_1-3_1_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json
index d728d2360..2db30758b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_2_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json
index 9b7ed7a90..65fd0b007 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_2_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json
index 0f4cf57d0..886efaf4a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_2_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -287,11 +287,11 @@
     },
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_2_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json
index 4a0b8b1cc..80dff29da 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json
index a7087d550..3c88c1883 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495616_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json
index f4558bc10..5f0d2e64b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json
index dee6fafbb..7a43adccb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495616_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json
index daf597463..6ee4a0ca1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495617_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json
index 6e74ee404..7b8eb8f14 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json
index 8e6f9afa8..7ddd29e05 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_21888242871839275222246405745257275088548364400416034343698204186575808495617_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json
index 49eef517c..430249542 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
@@ -283,11 +283,11 @@
     },
     "ecmul_1-3_115792089237316195423570985008687907853269984665640564039457584007913129639935_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json
index caa6c29bd..27005ffde 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json
index 0c3a8da2a..ab4b3b22e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_115792089237316195423570985008687907853269984665640564039457584007913129639935_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json
index d1698f8aa..bcb5b3a2a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_9_21000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json
index 7f9aa9738..7a7d2de89 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_9_21000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json
index 4a1bd137a..6d49000f4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_9_28000_128": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json
index 9cb7505f6..ccff1c7d2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json
@@ -1,11 +1,11 @@
 {
     "ecmul_11999875504842010600789954262886096740416429265635183817701593963271973497827-11843594000332171325303933275547366297934113019079887694534126289021216356598_9_28000_96": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_191Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_191Filler.json
index 4e8690620..c79cf2100 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_191Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_191Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_bad_length_191": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_193Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_193Filler.json
index 99407013d..02cd38856 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_193Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_bad_length_193Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_bad_length_193": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_dataFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_dataFiller.json
index 73b9cb03c..36b88a2a0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_dataFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_dataFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_empty_data": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json
index 24ce8771b..0b5a67934 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_empty_data_insufficient_gas": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_failFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_failFiller.json
index d5b574697..c5f6cd968 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_failFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_failFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_one_point_fail": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json
index 717733d71..85e330309 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_one_point_insufficient_gas": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json
index 49adcf764..f467cb4f4 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_one_point_not_in_subgroup": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json
index a49e8b503..97600d2e8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_one_point_with_g1_zero": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json
index 998c02b45..eadb3091f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_one_point_with_g2_zero": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json
index 59f61b0c9..929170c27 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_g2_by_curve_order": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json
index 6d7f0f82f..6f1c1a776 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_g2_by_field_modulus": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json
index 165bd05ae..432257d44 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_g2_by_field_modulus_again": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json
index d57dbc856..5dfeec36b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_g2_by_one": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json
index bf36788d4..7eebda5df 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_zeropoint_by_curve_order": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json
index 9210bdfca..6e00f1a06 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_zeropoint_by_field_modulus": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json
index 4eac2540c..88e97be5d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_perturb_zeropoint_by_one": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json
index 049dc3665..e42117d44 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_three_point_fail_1": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_match_1Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_match_1Filler.json
index 75bc42c3e..473bf61bf 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_match_1Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_three_point_match_1Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_three_point_match_1": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json
index 3b0d6b6ef..6747cb9e6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_fail_1": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json
index bb42fb31d..4ec79c71b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_fail_2": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_1Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_1Filler.json
index 1809dc29d..5ec1196b8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_1Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_1Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_match_1": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_2Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_2Filler.json
index 83bb9586b..8a356b86f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_2Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_2Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_match_2": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_3Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_3Filler.json
index 6b0c13d28..d3ad803dd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_3Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_3Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_match_3": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_4Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_4Filler.json
index 4197c4153..b36f654e3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_4Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_4Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_match_4": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_5Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_5Filler.json
index 6271295e5..4cf6d7cd7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_5Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_match_5Filler.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_match_5": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_oogFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_oogFiller.json
index eaaeedb3d..0a4f523a8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_oogFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_point_oogFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_point_oog": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json
index 0ef091885..7564c0899 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json
@@ -1,11 +1,11 @@
 {
     "ecpairing_two_points_with_one_g2_zero": {
         "env": {
-            "currentCoinbase": "0x3535353535353535353535353535353535353535",
-            "currentDifficulty": "0x1",
+            "currentCoinbase": "3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
             "currentGasLimit": "0x5f5e100",
-            "currentNumber": "0x1",
-            "currentTimestamp": "0x5777765e",
+            "currentNumber": "0x01",
+            "currentTimestamp": "1000",
             "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
         "pre": {