update general state tests fillers to suite blockchain

24 files changed, 72 insertions, 72 deletions

diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
index 5ed598671..16b24acf1 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODEFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json
index 3714c6aec..7bf98551b 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmptyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
index 1487dd246..43027045b 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalanceFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json
index eb5e00046..ad5281566 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKeyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
index bc8a23c51..87679183a 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
@@ -2,10 +2,10 @@
     "CALL_OneVCallSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json
index 93b0ee6ae..0b445055d 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToEmptyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
index 7fa7564f6..cdc5f3535 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalanceFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALL_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json
index 181d98edd..1f7c9172d 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKeyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json
index 21129f16f..015323ad1 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALLFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json
index 0cb9d07e7..5b965064b 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmptyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
index 1bc93c97c..0757b1a49 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalanceFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
index 9d5fd1850..8dafa23a3 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKeyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
index 0f5e337d3..3c37373a2 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
index 978dd9e30..d156c983e 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
index ec68af8ae..b0efd8f4e 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
index d1696702b..390687346 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json
index 170fdda89..089951c9e 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json
index 11c86535a..2af3d06e6 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmptyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
index 63494d4a4..4e3bf7c98 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalanceFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
index f29265e0e..35fd6527f 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json
index fb6b5efb2..3e36193d7 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithDataFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json
index 50d369f9c..1c9cf45ea 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmptyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
index 5c27236ee..45d9a6402 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalanceFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
index 5862096e5..ff5e08db7 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKeyFiller.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "10000000",
-            "currentNumber" : "2675000",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [