update general state tests fillers to suite blockchain

79 files changed, 237 insertions, 237 deletions

diff --git a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json
index e98772927..c8a413cdc 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json
@@ -2,10 +2,10 @@
     "call_OOG_additionalGasCosts1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json
index 0586a2eb2..6267c5dc5 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json
@@ -2,10 +2,10 @@
     "call_OOG_additionalGasCosts2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json
index 9d9c3c043..0374d071a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json
@@ -2,10 +2,10 @@
     "callcall_00" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json
index 35e36fb17..277749c00 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
index 940e9c3c6..43037969c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
index 191dba830..7a0701d63 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcall_00_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json
index a000b12f7..f048b2f77 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json
@@ -2,10 +2,10 @@
     "callcallcall_000" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json
index 587f36cad..a149f5561 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json
index de00549ee..7d16239c8 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
index c1e6df021..c9a102473 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
index c864423be..21afa094a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_000_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
index 48d05b058..85a855cc0 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_000_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
index f08ad9d64..60bf9b165 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcallcall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json
index 6a7660457..3f73d16fb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json
index 7722408fa..62b32fe07 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
index 322a69a92..97365df1d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
index 6bd71986f..1e0a10cfd 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
index 5dd0045c2..68eafbafb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
index 618849e93..ae4f6468b 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
index 94838f436..a3c316aae 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcallcallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json
index 3350ea184..8fc4ff663 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json
@@ -2,10 +2,10 @@
     "callcallcode_01" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json
index c37f7e1a5..ff899af7a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcallcode_01_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
index 5e6db0851..f28d9993f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcallcode_01_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json
index 708661274..51355d0c1 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json
index 958078b14..7c0032c4d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
index 87289b847..c32d53168 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
index dee598656..ca4fc9e5e 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
index a3a666385..c94edebe5 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
index e4ea29708..1c1b9f10f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
index 429163642..421fa2021 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json
index c32c9e764..40e993040 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
index a3b8ac87e..5f4686ef8 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
index 18ed210af..97001b481 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
index 81c547460..efb49c6cb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
index 5ef6ac5d0..0c45d02c2 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
index 1243e2c77..3e8c53d06 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index e9f5acefa..bafc5c1e1 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCode2SelfCallFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCode2SelfCallFiller.json
index f874dd351..5d2048f57 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCode2SelfCallFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCode2SelfCallFiller.json
@@ -2,10 +2,10 @@
     "callcodeDynamicCode2SelfCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
index a53ba3b46..375e91f36 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
@@ -2,10 +2,10 @@
     "callcodeDynamicCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeEmptycontractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeEmptycontractFiller.json
index 428331c4f..fb6df6581 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeEmptycontractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeEmptycontractFiller.json
@@ -2,10 +2,10 @@
     "callcodeEmptycontract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json
index 97046e22d..9a519742d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToEmptyContractFiller.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json
index 8442fad8c..632d78c00 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoneyFiller.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExisContractWithVTransferNEMoney" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
index d71a1f861..8347ac549 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json
index 0488904f9..d88f2c97a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransferFiller.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExistingContractWithValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "45678256",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json
index 4ef19211b..843688997 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json
@@ -2,10 +2,10 @@
     "callcode_checkPC" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json
index ee79f4790..f22dc55c3 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json
@@ -2,10 +2,10 @@
     "callcodecall_10" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json
index 43a5aac56..f0a2f9b5c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcodecall_10_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
index 329e69c48..cf041888f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcodecall_10_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json
index 5e321474f..bbfd49958 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json
index 542422020..46f0140d3 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
index c1eb78f5f..55af6c598 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
index 2c6f805fe..b74158e64 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
index 2b2908599..7af460f8d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
index fc978a2be..4f8da978e 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
index 86b599d68..ca035f6fc 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json
index 6c4426094..a4abb97b9 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
index 659521c94..5106c5222 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
index a1de36bf1..bd5d08948 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
index 434d23608..3268cc6b0 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
index 09137539f..c06f326e6 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
index c7281128c..ed47dba27 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index 2d4289125..26cdfdac9 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json
index 14717ac93..7320152f4 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json
index d1b0864fa..3ea016d57 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
index 6b4fdb4fc..6b0c5c48f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json
index 264252ee0..1b9ef27ad 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
index 8769eeb9d..2516de121 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
index 67bcc2f88..982373b22 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
index 0ece17c2b..8198dcbbc 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
index 770b2a025..56bd5460d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
index 6c601c9c0..7e9dca57c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index 9ee55a0ad..54d7fce04 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json
index 69118815e..61abd92f6 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
index 01036021a..8814969cf 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
index c4eda16b0..a88ebff0d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
index 634b147f9..4bd1f464a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
index f0399d73b..548b020d9 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index 2f81e448b..f803cfb33 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "30000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index 42ff46308..9692feb10 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "3000000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : 1,
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "expect" : [