refill general state tests

79 files changed, 237 insertions, 237 deletions

diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
index 7a51b86a6..4ec05c531 100644
--- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
+++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts1.json
@@ -2,10 +2,10 @@
     "call_OOG_additionalGasCosts1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
index a7a8d6b54..4ba15589a 100644
--- a/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
+++ b/GeneralStateTests/stCallCodes/call_OOG_additionalGasCosts2.json
@@ -2,10 +2,10 @@
     "call_OOG_additionalGasCosts2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcall_00.json b/GeneralStateTests/stCallCodes/callcall_00.json
index 09b3910e7..d1dfaed59 100644
--- a/GeneralStateTests/stCallCodes/callcall_00.json
+++ b/GeneralStateTests/stCallCodes/callcall_00.json
@@ -2,10 +2,10 @@
     "callcall_00" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
index cd41e1609..792e6698b 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
index 89659b193..4fb1d14cd 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_OOGE_valueTransfer.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
index 501e297c5..40778baa0 100644
--- a/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcall_00_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000.json b/GeneralStateTests/stCallCodes/callcallcall_000.json
index 0e994b2b1..629bc96ff 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000.json
@@ -2,10 +2,10 @@
     "callcallcall_000" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
index 2df0a2114..ff776e6ea 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
index 4a67c95b0..32dcf84b0 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
index d7e517d60..ca28d6d12 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
index 3ba0095af..e4b66af2b 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcall_000_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
index cecb68a25..457cb0ccf 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcall_000_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
index 0354b32e2..3ed138b59 100644
--- a/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001.json b/GeneralStateTests/stCallCodes/callcallcallcode_001.json
index af4a39959..08fe97988 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
index b603f70f0..ee6554bd8 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
index 5f3b793b8..45ac3f39c 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
index ae811374d..6ccb4ca44 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
index 906d841ab..52409ea68 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
index 0f5d35ef7..e2d83d807 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_001_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
index 031c2a508..084e05abd 100644
--- a/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01.json b/GeneralStateTests/stCallCodes/callcallcode_01.json
index 37b0ce685..ff4c58516 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01.json
@@ -2,10 +2,10 @@
     "callcallcode_01" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
index 69b85ab49..02c533dc2 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcode_01_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
index 4a90e992f..8852c5415 100644
--- a/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcode_01_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcode_01_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010.json b/GeneralStateTests/stCallCodes/callcallcodecall_010.json
index c1b671c6d..67b2f92b2 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
index e4c9e3c38..0f0ec90f8 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
index ef6212dd5..2766e1326 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
index 821e510b2..48e188d51 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
index b9aa24074..3c661d046 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
index ce57cdcae..5302e2069 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
index 1eaa8e9a7..4c38c2ade 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcodecall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
index c90b19515..762fab230 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
index 94c75b45f..780635b8c 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
index fbc1be2b2..2f47d1bc1 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
index 1627ec156..8b0ff74b9 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
index 841cac959..b09baa64b 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
index 5449d90a0..0538eda97 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_011_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
index bbc01aa4a..224b27427 100644
--- a/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
index f2487ae1d..e568bcb59 100644
--- a/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
+++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode.json
@@ -2,10 +2,10 @@
     "callcodeDynamicCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
index 6a6145b99..9e00d0a0c 100644
--- a/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
+++ b/GeneralStateTests/stCallCodes/callcodeDynamicCode2SelfCall.json
@@ -2,10 +2,10 @@
     "callcodeDynamicCode2SelfCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
index ae9fd0949..fbdd77fa3 100644
--- a/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
+++ b/GeneralStateTests/stCallCodes/callcodeEmptycontract.json
@@ -2,10 +2,10 @@
     "callcodeEmptycontract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
index f8dc0e92f..ceecb8ceb 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToEmptyContract.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
index 4f26cebcd..b34531a7c 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExisContractWithVTransferNEMoney.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExisContractWithVTransferNEMoney" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
index 4833823c2..eba3950d2 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContract.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
index 1535d7fe2..d7d709546 100644
--- a/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
+++ b/GeneralStateTests/stCallCodes/callcodeInInitcodeToExistingContractWithValueTransfer.json
@@ -2,10 +2,10 @@
     "callcodeInInitcodeToExistingContractWithValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcode_checkPC.json b/GeneralStateTests/stCallCodes/callcode_checkPC.json
index 53ba9c4b0..886369d8a 100644
--- a/GeneralStateTests/stCallCodes/callcode_checkPC.json
+++ b/GeneralStateTests/stCallCodes/callcode_checkPC.json
@@ -2,10 +2,10 @@
     "callcode_checkPC" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10.json b/GeneralStateTests/stCallCodes/callcodecall_10.json
index 4dcc17286..e923eabf4 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10.json
@@ -2,10 +2,10 @@
     "callcodecall_10" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
index ad9ae5af1..4fe4373e0 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecall_10_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
index 8873d2e6a..b80074d14 100644
--- a/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecall_10_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecall_10_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100.json b/GeneralStateTests/stCallCodes/callcodecallcall_100.json
index 8f6bd9cf6..f3d4fdf7c 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
index 1aa55e1c7..6ef623384 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
index 0fc8a8c33..54a96392a 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
index 2e75227a4..bbb28da92 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
index 5d6a5ecfe..fc3981c65 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
index 57b72ae9b..c7d772552 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_100_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
index 87fbff746..78bedad9c 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
index 6e1a214d7..47595a9cc 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
index 18a926233..3257da58f 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
index 39ca7c06c..4faaed553 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
index 7435121ab..88f31ebdf 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
index e0d1e6bd5..61038d538 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
index 322d3ff34..bc5ff68be 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_101_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
index aa2fad13f..fb4ce560a 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11.json b/GeneralStateTests/stCallCodes/callcodecallcode_11.json
index cac941969..53ee53bde 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
index 519255476..2bad4e101 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
index ebe19e358..3afff75eb 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
index 995833c03..56910f58d 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
index 1315db9d3..942763d45 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
index 6b5cadb0c..214eac704 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
index 1d0651e52..90c9b30b7 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
index ee93bcbd2..b95870884 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
index 8bf036ac7..8a526adb8 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_110_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
index 2465ff2a4..4bb1fa3f0 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
index 784f8f313..2bbfd62a3 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
index 61f8e34c2..9aea89e36 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
index d7ba5fba5..88727a9e1 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
index d5896cf09..79fcd2582 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
index 8012d09a7..5d9343e63 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
index 1fd35f404..d62063032 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
index 36fe40598..32a25e578 100644
--- a/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {