From 4bedb7293024d1724993df23d2b20863fe24c782 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethdev.com>
Date: Wed, 8 Feb 2017 21:13:33 +0400
Subject: update general state tests fillers to suite blockchain

---
 .../stBoundsTest/BLOCKHASH_BoundsFiller.json                      | 6 +++---
 .../stBoundsTest/BLOCKHASH_BoundsOOGFiller.json                   | 8 ++++----
 .../stBoundsTest/CALLCODE_Bounds2OOGFiller.json                   | 8 ++++----
 .../stBoundsTest/CALLCODE_Bounds3OOGFiller.json                   | 4 ++--
 .../stBoundsTest/CALLCODE_Bounds4Filler.json                      | 6 +++---
 .../stBoundsTest/CALLCODE_Bounds4OOGFiller.json                   | 6 +++---
 .../stBoundsTest/CALLCODE_BoundsOOGFiller.json                    | 6 +++---
 .../stBoundsTest/CALL_Bounds2OOGFiller.json                       | 6 +++---
 .../stBoundsTest/CALL_Bounds2aOOGFiller.json                      | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json  | 6 +++---
 .../stBoundsTest/CALL_Bounds3OOGFiller.json                       | 6 +++---
 .../stBoundsTest/CALL_BoundsOOGFiller.json                        | 6 +++---
 .../stBoundsTest/CREATE_Bounds2OOGFiller.json                     | 6 +++---
 .../stBoundsTest/CREATE_Bounds3Filler.json                        | 6 +++---
 .../stBoundsTest/CREATE_Bounds3OOGFiller.json                     | 6 +++---
 .../stBoundsTest/CREATE_BoundsOOGFiller.json                      | 6 +++---
 .../stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json               | 6 +++---
 .../stBoundsTest/DELEGATECALL_Bounds3Filler.json                  | 6 +++---
 .../stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json               | 6 +++---
 .../stBoundsTest/DELEGATECALL_BoundsOOGFiller.json                | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json    | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json  | 6 +++---
 .../stBoundsTest/JUMPI_BoundsOOGFiller.json                       | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json  | 6 +++---
 .../stBoundsTest/JUMP_Bounds2OOGFiller.json                       | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json   | 6 +++---
 .../stBoundsTest/JUMP_BoundsOOGFiller.json                        | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json | 6 +++---
 .../stBoundsTest/MLOAD_Bounds2OOGFiller.json                      | 6 +++---
 .../stBoundsTest/MLOAD_Bounds3OOGFiller.json                      | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsFiller.json  | 6 +++---
 .../stBoundsTest/MLOAD_BoundsOOGFiller.json                       | 6 +++---
 .../stBoundsTest/MSTORE_Bounds2Filler.json                        | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json | 6 +++---
 .../stBoundsTest/MSTORE_BoundsOOGFiller.json                      | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json    | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json | 6 +++---
 .../stBoundsTest/RETURN_BoundsOOGFiller.json                      | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json  | 6 +++---
 .../stBoundsTest/SLOAD_BoundsOOGFiller.json                       | 6 +++---
 src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json | 6 +++---
 .../stBoundsTest/SSTORE_BoundsOOGFiller.json                      | 6 +++---
 44 files changed, 133 insertions(+), 133 deletions(-)

(limited to 'src/GeneralStateTestsFiller/stBoundsTest')

diff --git a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json
index 3a6573458..a1db5856f 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json
@@ -2,10 +2,10 @@
     "BLOCKHASH_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : 1000,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json
index 234536c21..130c92da7 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "BLOCKHASH_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : 1000,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json
index cdf600ad6..2940d0905 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : 1000,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
@@ -65,4 +65,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json
index 95a55b77a..576e164af 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentTimestamp" : 1000,
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json
index b43c2de4a..a841d8ece 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json
index 9643ff34a..0964bae59 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds4OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json
index ea88e58fd..149a0233b 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "CALLCODE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json
index e4fe6d42e..8ae8a49a1 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json
@@ -2,10 +2,10 @@
     "CALL_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json
index 7177870e3..d1f2f6315 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json
@@ -2,10 +2,10 @@
     "CALL_Bounds2aOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json
index bf43daf7d..4a5648a28 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json
@@ -2,10 +2,10 @@
     "CALL_Bounds3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json
index b45866887..b378e5150 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json
@@ -2,10 +2,10 @@
     "CALL_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json
index 2fcf6e7f3..a685fca40 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "CALL_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json
index 261bf945b..f21d20846 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json
@@ -2,10 +2,10 @@
     "CREATE_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json
index bb3008143..91088cc69 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json
@@ -2,10 +2,10 @@
     "CREATE_Bounds3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json
index 00cf6cd7d..e123aec7f 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json
@@ -2,10 +2,10 @@
     "CREATE_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json
index 9cf20392c..817d88170 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "CREATE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json
index 25f0f2620..93f66b045 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json
index ed9148b10..3ad973050 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_Bounds3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json
index f644f083b..d189359c5 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json
index b8668fc62..1973dc59b 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json
index a84c8bcc7..b99da7c02 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json
@@ -2,10 +2,10 @@
     "DUP_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json
index 8e66f1c11..201a48b20 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "DUP_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json
index 4b44f49fb..dd63df063 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json
@@ -2,10 +2,10 @@
     "JUMPI_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json
index 09689e641..5998d603e 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "JUMPI_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json
index 12991b1de..60b3f77c3 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json
@@ -2,10 +2,10 @@
     "JUMP_Bounds2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json
index c352567e8..23b6ebb12 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json
@@ -2,10 +2,10 @@
     "JUMP_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json
index 1f0b9ccd4..51d5928a4 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json
@@ -2,10 +2,10 @@
     "JUMP_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json
index c1e52410d..192e4e482 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "JUMP_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json
index 35b79c2ba..72351efc1 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json
index e1de01eee..a5f92cb0f 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json
index f892c6be0..ee65b6273 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsFiller.json
index e00b43f80..3156de7aa 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsFiller.json
@@ -2,11 +2,11 @@
     "MLOAD_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
 	    "currentGasLimit" : "2^63-1",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json
index 511cea0fd..90edac117 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "MLOAD_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json
index a677ef49d..4d2233eda 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json
@@ -2,11 +2,11 @@
     "MSTORE_Bounds2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
 	    "currentGasLimit" : "2^63-1",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json
index 5d39f93da..61375c619 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json
@@ -2,10 +2,10 @@
     "MSTORE_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json
index b6ca0efa3..718798b0b 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "MSTORE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json
index 7997cb0fb..ca62b1da7 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json
@@ -2,10 +2,10 @@
     "POP_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json
index 53cc16de2..bc28af797 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "POP_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json
index 8b44a99a6..3a8b9044b 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json
@@ -2,10 +2,10 @@
     "RETURN_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json
index d38bedaed..f875d051c 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "RETURN_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json
index 51cdbf866..f4b6fa203 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json
@@ -2,10 +2,10 @@
     "SLOAD_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json
index d6776e343..853974748 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "SLOAD_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json
index 53f7538f3..603b3b997 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json
@@ -2,10 +2,10 @@
     "SSTORE_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json
index 3c51b8302..904615817 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json
@@ -2,10 +2,10 @@
     "SSTORE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "1150000",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
-- 
cgit