refill general state tests

58 files changed, 174 insertions, 174 deletions

diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
index 1476a47d2..53e6d8d20 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
index a2b434a2f..27039c481 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
index 7273d0025..2f2770712 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
index e80234afe..6f86979f2 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
index c50e9f400..83b3a9ab8 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
index dc03e308a..fa5a5140b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
index e5241f9a5..e187db982 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
index 6dd2d97d0..9b0472a32 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01.json
@@ -2,10 +2,10 @@
     "callcallcode_01" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
index 413fcb944..7c44f2397 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcode_01_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
index 358279f3e..54758d016 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcode_01_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
index fdf125b7b..47ad43c56 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
index ad5ebea48..221661de7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
index 6f4655acf..cfd5e198d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
index 03d643e57..f235b5f43 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
index ada996f1d..bf4390ca7 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
index e6707382b..fd0ed26fa 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
index 5105a5ba5..fd7fd2479 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcodecall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
index a49128ca3..15f174a12 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
index d7f13f8c3..2ea9d9d69 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
index 077ada16d..372b1dd59 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
index ee61a956f..e346956bd 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
index ffdfa5032..f32289773 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
index 7a1c1b487..d65f728f3 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
index 2db358446..b4cb71734 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
index 4463cc7c5..6defd0257 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10.json
@@ -2,10 +2,10 @@
     "callcodecall_10" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
index 9cfdc24a4..d2dca9a93 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecall_10_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
index 93e6400a6..1fd226ff2 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecall_10_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
index 8d7da351c..0fa16a52a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
index c2457ff36..7e0f43902 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
index b58c67fba..4ae2d3e3d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
index 6f6ef58dd..0166d8a74 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
index 696bf0263..56b557944 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
index 96e3bd307..cc7afaa4a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
index 2b719291b..b285a1a1b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
index 27deb9dc8..eeba75e56 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
index 87afb6b41..413d18ce5 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
index 56b2a6f37..107c80693 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
index d8926486d..32bbade5a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
index dc9681912..adf53983d 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
index be7c14c26..f8f2df8fc 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
index 7fa30f352..c58d6322b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
index d2254f41c..3d7ede87f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
index 4c632228a..f4c69c583 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
index 7eb272596..ca2a2ce92 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
index cf2949029..55aceca50 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
index a5b2256dc..a19c30a2f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
index 04d1a867b..4cc21399b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
index 331f7fc62..aebc1855c 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
index b994b1f03..bb2291c5f 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
index b4cb81026..a9a92f56e 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
index 52bed8073..1181b14e2 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
index dc21a82b7..b25776b3a 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
index cdbb2e860..46a072e3b 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
index d71f02872..4a599e862 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
index a2b536b0f..c8440d751 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
index 2ead12215..e0fcac658 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideEnd" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
index d1fcf16d9..50d2ea569 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideMiddle" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
index 60667ec19..3dc70c663 100644
--- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_ABCB_RECURSIVE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0xb2d05e00",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {