From 260e8aa302dbda4dd4a5aa905ce545a12eb4e618 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethdev.com>
Date: Wed, 8 Feb 2017 21:18:35 +0400
Subject: refill general state tests

---
 .../stAttackTest/ContractCreationSpam.json         |   6 +-
 GeneralStateTests/stBlockHashTest/blockhash0.json  | 422 ++++++++++++++++++++-
 .../stBlockHashTest/blockhashDOS-sec71.json        |   6 +-
 .../stBlockHashTest/blockhashInRange.json          | 112 +++++-
 .../stBlockHashTest/blockhashJIT.json              | 102 ++++-
 .../stBlockHashTest/blockhashOutOfRange.json       | 110 +++++-
 .../stBoundsTest/BLOCKHASH_Bounds.json             |  14 +-
 .../stBoundsTest/BLOCKHASH_BoundsOOG.json          |  14 +-
 .../stBoundsTest/CALLCODE_Bounds2OOG.json          |   6 +-
 .../stBoundsTest/CALLCODE_Bounds3OOG.json          |   4 +-
 .../stBoundsTest/CALLCODE_Bounds4.json             |   6 +-
 .../stBoundsTest/CALLCODE_Bounds4OOG.json          |   6 +-
 .../stBoundsTest/CALLCODE_BoundsOOG.json           |   6 +-
 .../stBoundsTest/CALL_Bounds2OOG.json              |   6 +-
 .../stBoundsTest/CALL_Bounds2aOOG.json             |   6 +-
 GeneralStateTests/stBoundsTest/CALL_Bounds3.json   |   6 +-
 .../stBoundsTest/CALL_Bounds3OOG.json              |   6 +-
 GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json |   6 +-
 .../stBoundsTest/CREATE_Bounds2OOG.json            |   6 +-
 GeneralStateTests/stBoundsTest/CREATE_Bounds3.json |   6 +-
 .../stBoundsTest/CREATE_Bounds3OOG.json            |   6 +-
 .../stBoundsTest/CREATE_BoundsOOG.json             |   6 +-
 .../stBoundsTest/DELEGATECALL_Bounds2OOG.json      |   6 +-
 .../stBoundsTest/DELEGATECALL_Bounds3.json         |   6 +-
 .../stBoundsTest/DELEGATECALL_Bounds3OOG.json      |   6 +-
 .../stBoundsTest/DELEGATECALL_BoundsOOG.json       |   6 +-
 GeneralStateTests/stBoundsTest/DUP_Bounds.json     |   6 +-
 GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json  |   6 +-
 GeneralStateTests/stBoundsTest/JUMPI_Bounds.json   |   6 +-
 .../stBoundsTest/JUMPI_BoundsOOG.json              |   6 +-
 GeneralStateTests/stBoundsTest/JUMP_Bounds.json    |   6 +-
 GeneralStateTests/stBoundsTest/JUMP_Bounds2.json   |   6 +-
 .../stBoundsTest/JUMP_Bounds2OOG.json              |   6 +-
 GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json |   6 +-
 GeneralStateTests/stBoundsTest/MLOAD_Bounds.json   |   6 +-
 GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json  |   6 +-
 .../stBoundsTest/MLOAD_Bounds2OOG.json             |   6 +-
 .../stBoundsTest/MLOAD_Bounds3OOG.json             |   6 +-
 .../stBoundsTest/MLOAD_BoundsOOG.json              |   6 +-
 GeneralStateTests/stBoundsTest/MSTORE_Bounds.json  |   6 +-
 GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json |   6 +-
 .../stBoundsTest/MSTORE_BoundsOOG.json             |   6 +-
 GeneralStateTests/stBoundsTest/POP_Bounds.json     |   6 +-
 GeneralStateTests/stBoundsTest/POP_BoundsOOG.json  |   6 +-
 GeneralStateTests/stBoundsTest/RETURN_Bounds.json  |   6 +-
 .../stBoundsTest/RETURN_BoundsOOG.json             |   6 +-
 GeneralStateTests/stBoundsTest/SLOAD_Bounds.json   |   6 +-
 .../stBoundsTest/SLOAD_BoundsOOG.json              |   6 +-
 GeneralStateTests/stBoundsTest/SSTORE_Bounds.json  |   6 +-
 .../stBoundsTest/SSTORE_BoundsOOG.json             |   6 +-
 .../stCallCodes/call_OOG_additionalGasCosts1.json  |   6 +-
 .../stCallCodes/call_OOG_additionalGasCosts2.json  |   6 +-
 GeneralStateTests/stCallCodes/callcall_00.json     |   6 +-
 .../stCallCodes/callcall_00_OOGE.json              |   6 +-
 .../callcall_00_OOGE_valueTransfer.json            |   6 +-
 .../stCallCodes/callcall_00_SuicideEnd.json        |   6 +-
 .../stCallCodes/callcallcall_000.json              |   6 +-
 .../stCallCodes/callcallcall_000_OOGE.json         |   6 +-
 .../stCallCodes/callcallcall_000_OOGMAfter.json    |   6 +-
 .../stCallCodes/callcallcall_000_OOGMBefore.json   |   6 +-
 .../stCallCodes/callcallcall_000_SuicideEnd.json   |   6 +-
 .../callcallcall_000_SuicideMiddle.json            |   6 +-
 .../stCallCodes/callcallcall_ABCB_RECURSIVE.json   |   6 +-
 .../stCallCodes/callcallcallcode_001.json          |   6 +-
 .../stCallCodes/callcallcallcode_001_OOGE.json     |   6 +-
 .../callcallcallcode_001_OOGMAfter.json            |   6 +-
 .../callcallcallcode_001_OOGMBefore.json           |   6 +-
 .../callcallcallcode_001_SuicideEnd.json           |   6 +-
 .../callcallcallcode_001_SuicideMiddle.json        |   6 +-
 .../callcallcallcode_ABCB_RECURSIVE.json           |   6 +-
 GeneralStateTests/stCallCodes/callcallcode_01.json |   6 +-
 .../stCallCodes/callcallcode_01_OOGE.json          |   6 +-
 .../stCallCodes/callcallcode_01_SuicideEnd.json    |   6 +-
 .../stCallCodes/callcallcodecall_010.json          |   6 +-
 .../stCallCodes/callcallcodecall_010_OOGE.json     |   6 +-
 .../callcallcodecall_010_OOGMAfter.json            |   6 +-
 .../callcallcodecall_010_OOGMBefore.json           |   6 +-
 .../callcallcodecall_010_SuicideEnd.json           |   6 +-
 .../callcallcodecall_010_SuicideMiddle.json        |   6 +-
 .../callcallcodecall_ABCB_RECURSIVE.json           |   6 +-
 .../stCallCodes/callcallcodecallcode_011.json      |   6 +-
 .../stCallCodes/callcallcodecallcode_011_OOGE.json |   6 +-
 .../callcallcodecallcode_011_OOGMAfter.json        |   6 +-
 .../callcallcodecallcode_011_OOGMBefore.json       |   6 +-
 .../callcallcodecallcode_011_SuicideEnd.json       |   6 +-
 .../callcallcodecallcode_011_SuicideMiddle.json    |   6 +-
 .../callcallcodecallcode_ABCB_RECURSIVE.json       |   6 +-
 .../stCallCodes/callcodeDynamicCode.json           |   6 +-
 .../stCallCodes/callcodeDynamicCode2SelfCall.json  |   6 +-
 .../stCallCodes/callcodeEmptycontract.json         |   6 +-
 .../callcodeInInitcodeToEmptyContract.json         |   6 +-
 ...InitcodeToExisContractWithVTransferNEMoney.json |   6 +-
 .../callcodeInInitcodeToExistingContract.json      |   6 +-
 ...nitcodeToExistingContractWithValueTransfer.json |   6 +-
 .../stCallCodes/callcode_checkPC.json              |   6 +-
 GeneralStateTests/stCallCodes/callcodecall_10.json |   6 +-
 .../stCallCodes/callcodecall_10_OOGE.json          |   6 +-
 .../stCallCodes/callcodecall_10_SuicideEnd.json    |   6 +-
 .../stCallCodes/callcodecallcall_100.json          |   6 +-
 .../stCallCodes/callcodecallcall_100_OOGE.json     |   6 +-
 .../callcodecallcall_100_OOGMAfter.json            |   6 +-
 .../callcodecallcall_100_OOGMBefore.json           |   6 +-
 .../callcodecallcall_100_SuicideEnd.json           |   6 +-
 .../callcodecallcall_100_SuicideMiddle.json        |   6 +-
 .../callcodecallcall_ABCB_RECURSIVE.json           |   6 +-
 .../stCallCodes/callcodecallcallcode_101.json      |   6 +-
 .../stCallCodes/callcodecallcallcode_101_OOGE.json |   6 +-
 .../callcodecallcallcode_101_OOGMAfter.json        |   6 +-
 .../callcodecallcallcode_101_OOGMBefore.json       |   6 +-
 .../callcodecallcallcode_101_SuicideEnd.json       |   6 +-
 .../callcodecallcallcode_101_SuicideMiddle.json    |   6 +-
 .../callcodecallcallcode_ABCB_RECURSIVE.json       |   6 +-
 .../stCallCodes/callcodecallcode_11.json           |   6 +-
 .../stCallCodes/callcodecallcode_11_OOGE.json      |   6 +-
 .../callcodecallcode_11_SuicideEnd.json            |   6 +-
 .../stCallCodes/callcodecallcodecall_110.json      |   6 +-
 .../stCallCodes/callcodecallcodecall_110_OOGE.json |   6 +-
 .../callcodecallcodecall_110_OOGMAfter.json        |   6 +-
 .../callcodecallcodecall_110_OOGMBefore.json       |   6 +-
 .../callcodecallcodecall_110_SuicideEnd.json       |   6 +-
 .../callcodecallcodecall_110_SuicideMiddle.json    |   6 +-
 .../callcodecallcodecall_ABCB_RECURSIVE.json       |   6 +-
 .../stCallCodes/callcodecallcodecallcode_111.json  |   6 +-
 .../callcodecallcodecallcode_111_OOGE.json         |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter.json    |   6 +-
 .../callcodecallcodecallcode_111_OOGMBefore.json   |   6 +-
 .../callcodecallcodecallcode_111_SuicideEnd.json   |   6 +-
 ...callcodecallcodecallcode_111_SuicideMiddle.json |   6 +-
 .../callcodecallcodecallcode_ABCB_RECURSIVE.json   |   6 +-
 .../Call1024BalanceTooLow.json                     |   6 +-
 .../stCallCreateCallCodeTest/Call1024OOG.json      |   6 +-
 .../stCallCreateCallCodeTest/Call1024PreCalls.json |   6 +-
 .../stCallCreateCallCodeTest/CallLoseGasOOG.json   |   6 +-
 .../CallRecursiveBombPreCall.json                  |   6 +-
 .../Callcode1024BalanceTooLow.json                 |   6 +-
 .../stCallCreateCallCodeTest/Callcode1024OOG.json  |   6 +-
 .../CallcodeLoseGasOOG.json                        |   6 +-
 .../stCallCreateCallCodeTest/callOutput1.json      |   6 +-
 .../stCallCreateCallCodeTest/callOutput2.json      |   6 +-
 .../stCallCreateCallCodeTest/callOutput3.json      |   6 +-
 .../stCallCreateCallCodeTest/callOutput3Fail.json  |   6 +-
 .../callOutput3partial.json                        |   6 +-
 .../callOutput3partialFail.json                    |   6 +-
 .../callWithHighValue.json                         |   6 +-
 .../callWithHighValueAndGasOOG.json                |   6 +-
 .../callWithHighValueAndOOGatTxLevel.json          |   6 +-
 .../callWithHighValueOOGinCall.json                |   6 +-
 .../stCallCreateCallCodeTest/callcodeOutput1.json  |   6 +-
 .../stCallCreateCallCodeTest/callcodeOutput2.json  |   6 +-
 .../stCallCreateCallCodeTest/callcodeOutput3.json  |   6 +-
 .../callcodeOutput3Fail.json                       |   6 +-
 .../callcodeOutput3partial.json                    |   6 +-
 .../callcodeOutput3partialFail.json                |   6 +-
 .../callcodeWithHighValue.json                     |   6 +-
 .../callcodeWithHighValueAndGasOOG.json            |   6 +-
 .../createFailBalanceTooLow.json                   |   6 +-
 .../createInitFailBadJumpDestination.json          |   6 +-
 .../createInitFailStackSizeLargerThan1024.json     |   6 +-
 .../createInitFailStackUnderflow.json              |   6 +-
 .../createInitFailUndefinedInstruction.json        |   6 +-
 .../createInitFail_OOGduringInit.json              |   6 +-
 .../createInitOOGforCREATE.json                    |   6 +-
 .../createJS_ExampleContract.json                  |  14 +-
 .../createJS_NoCollision.json                      |  16 +-
 .../createNameRegistratorPerTxs.json               |   6 +-
 .../createNameRegistratorPerTxsNotEnoughGas.json   |   6 +-
 ...createNameRegistratorPreStore1NotEnoughGas.json |   6 +-
 .../createNameRegistratorendowmentTooHigh.json     |   6 +-
 .../callcallcallcode_001.json                      |   6 +-
 .../callcallcallcode_001_OOGE.json                 |   6 +-
 .../callcallcallcode_001_OOGMAfter.json            |   6 +-
 .../callcallcallcode_001_OOGMBefore.json           |   6 +-
 .../callcallcallcode_001_SuicideEnd.json           |   6 +-
 .../callcallcallcode_001_SuicideMiddle.json        |   6 +-
 .../callcallcallcode_ABCB_RECURSIVE.json           |   6 +-
 .../callcallcode_01.json                           |   6 +-
 .../callcallcode_01_OOGE.json                      |   6 +-
 .../callcallcode_01_SuicideEnd.json                |   6 +-
 .../callcallcodecall_010.json                      |   6 +-
 .../callcallcodecall_010_OOGE.json                 |   6 +-
 .../callcallcodecall_010_OOGMAfter.json            |   6 +-
 .../callcallcodecall_010_OOGMBefore.json           |   6 +-
 .../callcallcodecall_010_SuicideEnd.json           |   6 +-
 .../callcallcodecall_010_SuicideMiddle.json        |   6 +-
 .../callcallcodecall_ABCB_RECURSIVE.json           |   6 +-
 .../callcallcodecallcode_011.json                  |   6 +-
 .../callcallcodecallcode_011_OOGE.json             |   6 +-
 .../callcallcodecallcode_011_OOGMAfter.json        |   6 +-
 .../callcallcodecallcode_011_OOGMBefore.json       |   6 +-
 .../callcallcodecallcode_011_SuicideEnd.json       |   6 +-
 .../callcallcodecallcode_011_SuicideMiddle.json    |   6 +-
 .../callcallcodecallcode_ABCB_RECURSIVE.json       |   6 +-
 .../callcodecall_10.json                           |   6 +-
 .../callcodecall_10_OOGE.json                      |   6 +-
 .../callcodecall_10_SuicideEnd.json                |   6 +-
 .../callcodecallcall_100.json                      |   6 +-
 .../callcodecallcall_100_OOGE.json                 |   6 +-
 .../callcodecallcall_100_OOGMAfter.json            |   6 +-
 .../callcodecallcall_100_OOGMBefore.json           |   6 +-
 .../callcodecallcall_100_SuicideEnd.json           |   6 +-
 .../callcodecallcall_100_SuicideMiddle.json        |   6 +-
 .../callcodecallcall_ABCB_RECURSIVE.json           |   6 +-
 .../callcodecallcallcode_101.json                  |   6 +-
 .../callcodecallcallcode_101_OOGE.json             |   6 +-
 .../callcodecallcallcode_101_OOGMAfter.json        |   6 +-
 .../callcodecallcallcode_101_OOGMBefore.json       |   6 +-
 .../callcodecallcallcode_101_SuicideEnd.json       |   6 +-
 .../callcodecallcallcode_101_SuicideMiddle.json    |   6 +-
 .../callcodecallcallcode_ABCB_RECURSIVE.json       |   6 +-
 .../callcodecallcode_11.json                       |   6 +-
 .../callcodecallcode_11_OOGE.json                  |   6 +-
 .../callcodecallcode_11_SuicideEnd.json            |   6 +-
 .../callcodecallcodecall_110.json                  |   6 +-
 .../callcodecallcodecall_110_OOGE.json             |   6 +-
 .../callcodecallcodecall_110_OOGMAfter.json        |   6 +-
 .../callcodecallcodecall_110_OOGMBefore.json       |   6 +-
 .../callcodecallcodecall_110_SuicideEnd.json       |   6 +-
 .../callcodecallcodecall_110_SuicideMiddle.json    |   6 +-
 .../callcodecallcodecall_ABCB_RECURSIVE.json       |   6 +-
 .../callcodecallcodecallcode_111.json              |   6 +-
 .../callcodecallcodecallcode_111_OOGE.json         |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter.json    |   6 +-
 .../callcodecallcodecallcode_111_OOGMBefore.json   |   6 +-
 .../callcodecallcodecallcode_111_SuicideEnd.json   |   6 +-
 ...callcodecallcodecallcode_111_SuicideMiddle.json |   6 +-
 .../callcodecallcodecallcode_ABCB_RECURSIVE.json   |   6 +-
 .../callcallcallcode_001.json                      |   6 +-
 .../callcallcallcode_001_OOGE.json                 |   6 +-
 .../callcallcallcode_001_OOGMAfter.json            |   6 +-
 .../callcallcallcode_001_OOGMBefore.json           |   6 +-
 .../callcallcallcode_001_SuicideEnd.json           |   6 +-
 .../callcallcallcode_001_SuicideMiddle.json        |   6 +-
 .../callcallcallcode_ABCB_RECURSIVE.json           |   6 +-
 .../callcallcode_01.json                           |   6 +-
 .../callcallcode_01_OOGE.json                      |   6 +-
 .../callcallcode_01_SuicideEnd.json                |   6 +-
 .../callcallcodecall_010.json                      |   6 +-
 .../callcallcodecall_010_OOGE.json                 |   6 +-
 .../callcallcodecall_010_OOGMAfter.json            |   6 +-
 .../callcallcodecall_010_OOGMBefore.json           |   6 +-
 .../callcallcodecall_010_SuicideEnd.json           |   6 +-
 .../callcallcodecall_010_SuicideMiddle.json        |   6 +-
 .../callcallcodecall_ABCB_RECURSIVE.json           |   6 +-
 .../callcallcodecallcode_011.json                  |   6 +-
 .../callcallcodecallcode_011_OOGE.json             |   6 +-
 .../callcallcodecallcode_011_OOGMAfter.json        |   6 +-
 .../callcallcodecallcode_011_OOGMBefore.json       |   6 +-
 .../callcallcodecallcode_011_SuicideEnd.json       |   6 +-
 .../callcallcodecallcode_011_SuicideMiddle.json    |   6 +-
 .../callcallcodecallcode_ABCB_RECURSIVE.json       |   6 +-
 .../callcodecall_10.json                           |   6 +-
 .../callcodecall_10_OOGE.json                      |   6 +-
 .../callcodecall_10_SuicideEnd.json                |   6 +-
 .../callcodecallcall_100.json                      |   6 +-
 .../callcodecallcall_100_OOGE.json                 |   6 +-
 .../callcodecallcall_100_OOGMAfter.json            |   6 +-
 .../callcodecallcall_100_OOGMBefore.json           |   6 +-
 .../callcodecallcall_100_SuicideEnd.json           |   6 +-
 .../callcodecallcall_100_SuicideMiddle.json        |   6 +-
 .../callcodecallcall_ABCB_RECURSIVE.json           |   6 +-
 .../callcodecallcallcode_101.json                  |   6 +-
 .../callcodecallcallcode_101_OOGE.json             |   6 +-
 .../callcodecallcallcode_101_OOGMAfter.json        |   6 +-
 .../callcodecallcallcode_101_OOGMBefore.json       |   6 +-
 .../callcodecallcallcode_101_SuicideEnd.json       |   6 +-
 .../callcodecallcallcode_101_SuicideMiddle.json    |   6 +-
 .../callcodecallcallcode_ABCB_RECURSIVE.json       |   6 +-
 .../callcodecallcode_11.json                       |   6 +-
 .../callcodecallcode_11_OOGE.json                  |   6 +-
 .../callcodecallcode_11_SuicideEnd.json            |   6 +-
 .../callcodecallcodecall_110.json                  |   6 +-
 .../callcodecallcodecall_110_OOGE.json             |   6 +-
 .../callcodecallcodecall_110_OOGMAfter.json        |   6 +-
 .../callcodecallcodecall_110_OOGMBefore.json       |   6 +-
 .../callcodecallcodecall_110_SuicideEnd.json       |   6 +-
 .../callcodecallcodecall_110_SuicideMiddle.json    |   6 +-
 .../callcodecallcodecall_ABCB_RECURSIVE.json       |   6 +-
 .../callcodecallcodecallcode_111.json              |   6 +-
 .../callcodecallcodecallcode_111_OOGE.json         |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter.json    |   6 +-
 .../callcodecallcodecallcode_111_OOGMBefore.json   |   6 +-
 .../callcodecallcodecallcode_111_SuicideEnd.json   |   6 +-
 ...callcodecallcodecallcode_111_SuicideMiddle.json |   6 +-
 .../callcodecallcodecallcode_ABCB_RECURSIVE.json   |   6 +-
 .../stChangedEIP150/Call1024BalanceTooLow.json     |   4 +-
 .../stChangedEIP150/Call1024PreCalls.json          |   6 +-
 .../stChangedEIP150/Callcode1024BalanceTooLow.json |   6 +-
 .../stChangedEIP150/callcall_00_OOGE_1.json        |   6 +-
 .../stChangedEIP150/callcall_00_OOGE_2.json        |   6 +-
 .../callcall_00_OOGE_valueTransfer.json            |   6 +-
 .../callcallcall_000_OOGMAfter.json                |   6 +-
 .../callcallcallcode_001_OOGMAfter_1.json          |   6 +-
 .../callcallcallcode_001_OOGMAfter_2.json          |   6 +-
 .../callcallcallcode_001_OOGMAfter_3.json          |   6 +-
 .../callcallcodecall_010_OOGMAfter_1.json          |   6 +-
 .../callcallcodecall_010_OOGMAfter_2.json          |   6 +-
 .../callcallcodecall_010_OOGMAfter_3.json          |   6 +-
 .../callcallcodecallcode_011_OOGMAfter_1.json      |   6 +-
 .../callcallcodecallcode_011_OOGMAfter_2.json      |   6 +-
 .../callcodecallcall_100_OOGMAfter_1.json          |   6 +-
 .../callcodecallcall_100_OOGMAfter_2.json          |   6 +-
 .../callcodecallcall_100_OOGMAfter_3.json          |   6 +-
 .../callcodecallcallcode_101_OOGMAfter_1.json      |   6 +-
 .../callcodecallcallcode_101_OOGMAfter_2.json      |   6 +-
 .../callcodecallcallcode_101_OOGMAfter_3.json      |   6 +-
 .../callcodecallcodecall_110_OOGMAfter_1.json      |   6 +-
 .../callcodecallcodecall_110_OOGMAfter_2.json      |   6 +-
 .../callcodecallcodecall_110_OOGMAfter_3.json      |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter.json    |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter_1.json  |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter_2.json  |   6 +-
 .../callcodecallcodecallcode_111_OOGMAfter_3.json  |   6 +-
 ...eCallThatAskMoreGasThenTransactionProvided.json |   6 +-
 .../createInitFail_OOGduringInit.json              |   6 +-
 .../stCodeSizeLimit/codesizeOOGInvalidSize.json    |   4 +-
 .../stCodeSizeLimit/codesizeValid.json             |   6 +-
 .../CREATE_AcreateB_BSuicide_BStore.json           |   6 +-
 .../CREATE_ContractSuicideDuringInit.json          |   6 +-
 ...tractSuicideDuringInit_ThenStoreThenReturn.json |   6 +-
 ...CREATE_ContractSuicideDuringInit_WithValue.json |   6 +-
 ...ontractSuicideDuringInit_WithValueToItself.json |   6 +-
 .../CREATE_EContractCreateEContractInInit_Tr.json  |   6 +-
 ...EATE_EContractCreateNEContractInInitOOG_Tr.json |   6 +-
 .../CREATE_EContractCreateNEContractInInit_Tr.json |   6 +-
 .../CREATE_EContract_ThenCALLToNonExistentAcc.json |   6 +-
 .../stCreateTest/CREATE_EmptyContract.json         |   6 +-
 .../CREATE_EmptyContractAndCallIt_0wei.json        |   6 +-
 .../CREATE_EmptyContractAndCallIt_1wei.json        |   6 +-
 .../CREATE_EmptyContractWithBalance.json           |   6 +-
 .../CREATE_EmptyContractWithStorage.json           |   6 +-
 ...ATE_EmptyContractWithStorageAndCallIt_0wei.json |   6 +-
 ...ATE_EmptyContractWithStorageAndCallIt_1wei.json |   6 +-
 ...REATE_empty000CreateinInitCode_Transaction.json |   6 +-
 .../Call1024BalanceTooLow.json                     |   6 +-
 .../stDelegatecallTestHomestead/Call1024OOG.json   |   6 +-
 .../Call1024PreCalls.json                          |   6 +-
 .../CallLoseGasOOG.json                            |   6 +-
 .../CallRecursiveBombPreCall.json                  |   6 +-
 .../CallcodeLoseGasOOG.json                        |   6 +-
 .../Delegatecall1024.json                          |   6 +-
 .../Delegatecall1024OOG.json                       |   6 +-
 .../stDelegatecallTestHomestead/callOutput1.json   |   6 +-
 .../stDelegatecallTestHomestead/callOutput2.json   |   6 +-
 .../stDelegatecallTestHomestead/callOutput3.json   |   6 +-
 .../callOutput3Fail.json                           |   6 +-
 .../callOutput3partial.json                        |   6 +-
 .../callOutput3partialFail.json                    |   6 +-
 .../callWithHighValueAndGasOOG.json                |   6 +-
 .../callcodeOutput1.json                           |   6 +-
 .../callcodeOutput2.json                           |   6 +-
 .../callcodeOutput3.json                           |   6 +-
 .../callcodeOutput3Fail.json                       |   6 +-
 .../callcodeOutput3partial.json                    |   6 +-
 .../callcodeOutput3partialFail.json                |   6 +-
 .../callcodeWithHighValueAndGasOOG.json            |   6 +-
 .../deleagateCallAfterValueTransfer.json           |   6 +-
 .../delegatecallAndOOGatTxLevel.json               |   6 +-
 .../delegatecallBasic.json                         |   6 +-
 .../delegatecallEmptycontract.json                 |   6 +-
 .../delegatecallInInitcodeToEmptyContract.json     |   6 +-
 .../delegatecallInInitcodeToExistingContract.json  |   6 +-
 ...elegatecallInInitcodeToExistingContractOOG.json |   6 +-
 .../delegatecallOOGinCall.json                     |   6 +-
 .../delegatecallSenderCheck.json                   |   6 +-
 .../delegatecallValueCheck.json                    |   6 +-
 .../delegatecodeDynamicCode.json                   |   6 +-
 .../delegatecodeDynamicCode2SelfCall.json          |   6 +-
 ...ndCallcodeConsumeMoreGasThenTransactionHas.json |   6 +-
 .../CallAskMoreGasOnDepth2ThenTransactionHas.json  |   6 +-
 .../stEIP150Specific/CallGoesOOGOnSecondLevel.json |   6 +-
 .../CallGoesOOGOnSecondLevel2.json                 |   6 +-
 .../stEIP150Specific/CreateAndGasInsideCreate.json |   6 +-
 .../stEIP150Specific/DelegateCallOnEIP.json        |   6 +-
 ...xecuteCallThatAskForeGasThenTrabsactionHas.json |   6 +-
 .../stEIP150Specific/NewGasPriceForCodes.json      |   6 +-
 .../SuicideToExistingContract.json                 |   6 +-
 .../SuicideToNotExistingContract.json              |   6 +-
 .../stEIP150Specific/Transaction64Rule_d64e0.json  |   6 +-
 .../stEIP150Specific/Transaction64Rule_d64m1.json  |   6 +-
 .../stEIP150Specific/Transaction64Rule_d64p1.json  |   6 +-
 .../stEIP150singleCodeGasPrices/RawBalanceGas.json |   6 +-
 .../RawCallCodeGas.json                            |   6 +-
 .../RawCallCodeGasAsk.json                         |   6 +-
 .../RawCallCodeGasMemory.json                      |   6 +-
 .../RawCallCodeGasMemoryAsk.json                   |   6 +-
 .../RawCallCodeGasValueTransfer.json               |   6 +-
 .../RawCallCodeGasValueTransferAsk.json            |   6 +-
 .../RawCallCodeGasValueTransferMemory.json         |   6 +-
 .../RawCallCodeGasValueTransferMemoryAsk.json      |   6 +-
 .../stEIP150singleCodeGasPrices/RawCallGas.json    |   6 +-
 .../stEIP150singleCodeGasPrices/RawCallGasAsk.json |   6 +-
 .../RawCallGasValueTransfer.json                   |   6 +-
 .../RawCallGasValueTransferAsk.json                |   6 +-
 .../RawCallGasValueTransferMemory.json             |   6 +-
 .../RawCallGasValueTransferMemoryAsk.json          |   6 +-
 .../RawCallMemoryGas.json                          |   6 +-
 .../RawCallMemoryGasAsk.json                       |   6 +-
 .../RawCreateFailGasValueTransfer.json             |   6 +-
 .../RawCreateFailGasValueTransfer2.json            |   6 +-
 .../stEIP150singleCodeGasPrices/RawCreateGas.json  |   6 +-
 .../RawCreateGasMemory.json                        |   6 +-
 .../RawCreateGasValueTransfer.json                 |   6 +-
 .../RawCreateGasValueTransferMemory.json           |   6 +-
 .../RawDelegateCallGas.json                        |   6 +-
 .../RawDelegateCallGasAsk.json                     |   6 +-
 .../RawDelegateCallGasMemory.json                  |   6 +-
 .../RawDelegateCallGasMemoryAsk.json               |   6 +-
 .../RawExtCodeCopyGas.json                         |   6 +-
 .../RawExtCodeCopyMemoryGas.json                   |   6 +-
 .../RawExtCodeSizeGas.json                         |   6 +-
 .../stEIP158Specific/CALL_OneVCallSuicide.json     |   6 +-
 .../stEIP158Specific/CALL_ZeroVCallSuicide.json    |   6 +-
 GeneralStateTests/stEIP158Specific/EXP_Empty.json  |   6 +-
 .../stEIP158Specific/EXTCODESIZE_toEpmty.json      |   6 +-
 .../EXTCODESIZE_toNonExistent.json                 |   6 +-
 .../stEIP158Specific/vitalikTransactionTest.json   |   6 +-
 GeneralStateTests/stExample/add11.json             |   6 +-
 .../contractCreationOOGdontLeaveEmptyContract.json |   6 +-
 ...ionOOGdontLeaveEmptyContractViaTransaction.json |   6 +-
 .../createContractViaContract.json                 |   6 +-
 .../createContractViaContractOOGInitCode.json      |   6 +-
 .../createContractViaTransactionCost53000.json     |   6 +-
 .../CallContractToCreateContractAndCallItOOG.json  |   6 +-
 .../CallContractToCreateContractNoCash.json        |   6 +-
 .../CallContractToCreateContractOOG.json           |   6 +-
 .../CallContractToCreateContractOOGBonusGas.json   |   6 +-
 ...teContractWhichWouldCreateContractIfCalled.json |   6 +-
 ...ContractWhichWouldCreateContractInInitCode.json |   6 +-
 .../stInitCodeTest/CallRecursiveContract.json      |   6 +-
 .../CallTheContractToCreateEmptyContract.json      |   6 +-
 .../NotEnoughCashContractCreation.json             |   6 +-
 .../stInitCodeTest/OutOfGasContractCreation.json   |   6 +-
 .../OutOfGasPrefundedContractCreation.json         |   6 +-
 GeneralStateTests/stInitCodeTest/ReturnTest.json   |   6 +-
 GeneralStateTests/stInitCodeTest/ReturnTest2.json  |   6 +-
 .../StackUnderFlowContractCreation.json            |   6 +-
 .../TransactionCreateAutoSuicideContract.json      |   6 +-
 .../TransactionCreateRandomInitCode.json           |   6 +-
 .../TransactionCreateStopInInitcode.json           |   6 +-
 .../TransactionCreateSuicideInInitcode.json        |   6 +-
 GeneralStateTests/stLogTests/log0_emptyMem.json    |   6 +-
 .../stLogTests/log0_logMemStartTooHigh.json        |   6 +-
 .../stLogTests/log0_logMemsizeTooHigh.json         |   6 +-
 .../stLogTests/log0_logMemsizeZero.json            |   6 +-
 GeneralStateTests/stLogTests/log0_nonEmptyMem.json |   6 +-
 .../stLogTests/log0_nonEmptyMem_logMemSize1.json   |   6 +-
 ...log0_nonEmptyMem_logMemSize1_logMemStart31.json |   6 +-
 GeneralStateTests/stLogTests/log1_Caller.json      |   6 +-
 GeneralStateTests/stLogTests/log1_MaxTopic.json    |   6 +-
 GeneralStateTests/stLogTests/log1_emptyMem.json    |   6 +-
 .../stLogTests/log1_logMemStartTooHigh.json        |   6 +-
 .../stLogTests/log1_logMemsizeTooHigh.json         |   6 +-
 .../stLogTests/log1_logMemsizeZero.json            |   6 +-
 GeneralStateTests/stLogTests/log1_nonEmptyMem.json |   6 +-
 .../stLogTests/log1_nonEmptyMem_logMemSize1.json   |   6 +-
 ...log1_nonEmptyMem_logMemSize1_logMemStart31.json |   6 +-
 GeneralStateTests/stLogTests/log2_Caller.json      |   6 +-
 GeneralStateTests/stLogTests/log2_MaxTopic.json    |   6 +-
 GeneralStateTests/stLogTests/log2_emptyMem.json    |   6 +-
 .../stLogTests/log2_logMemStartTooHigh.json        |   6 +-
 .../stLogTests/log2_logMemsizeTooHigh.json         |   6 +-
 .../stLogTests/log2_logMemsizeZero.json            |   6 +-
 GeneralStateTests/stLogTests/log2_nonEmptyMem.json |   6 +-
 .../stLogTests/log2_nonEmptyMem_logMemSize1.json   |   6 +-
 ...log2_nonEmptyMem_logMemSize1_logMemStart31.json |   6 +-
 GeneralStateTests/stLogTests/log3_Caller.json      |   6 +-
 GeneralStateTests/stLogTests/log3_MaxTopic.json    |   6 +-
 GeneralStateTests/stLogTests/log3_PC.json          |   6 +-
 GeneralStateTests/stLogTests/log3_emptyMem.json    |   6 +-
 .../stLogTests/log3_logMemStartTooHigh.json        |   6 +-
 .../stLogTests/log3_logMemsizeTooHigh.json         |   6 +-
 .../stLogTests/log3_logMemsizeZero.json            |   6 +-
 GeneralStateTests/stLogTests/log3_nonEmptyMem.json |   6 +-
 .../stLogTests/log3_nonEmptyMem_logMemSize1.json   |   6 +-
 ...log3_nonEmptyMem_logMemSize1_logMemStart31.json |   6 +-
 GeneralStateTests/stLogTests/log4_Caller.json      |   6 +-
 GeneralStateTests/stLogTests/log4_MaxTopic.json    |   6 +-
 GeneralStateTests/stLogTests/log4_PC.json          |   6 +-
 GeneralStateTests/stLogTests/log4_emptyMem.json    |   6 +-
 .../stLogTests/log4_logMemStartTooHigh.json        |   6 +-
 .../stLogTests/log4_logMemsizeTooHigh.json         |   6 +-
 .../stLogTests/log4_logMemsizeZero.json            |   6 +-
 GeneralStateTests/stLogTests/log4_nonEmptyMem.json |   6 +-
 .../stLogTests/log4_nonEmptyMem_logMemSize1.json   |   6 +-
 ...log4_nonEmptyMem_logMemSize1_logMemStart31.json |   6 +-
 GeneralStateTests/stLogTests/logInOOG_Call.json    |   6 +-
 ...GasThenTransactionHasWithMemExpandingCalls.json |   6 +-
 ...th2ThenTransactionHasWithMemExpandingCalls.json |   6 +-
 ...GoesOOGOnSecondLevel2WithMemExpandingCalls.json |   6 +-
 ...lGoesOOGOnSecondLevelWithMemExpandingCalls.json |   6 +-
 ...ateAndGasInsideCreateWithMemExpandingCalls.json |   6 +-
 .../DelegateCallOnEIPWithMemExpandingCalls.json    |   6 +-
 ...GasThenTransactionHasWithMemExpandingCalls.json |   6 +-
 .../NewGasPriceForCodesWithMemExpandingCalls.json  |   6 +-
 .../stMemoryTest/calldatacopy_dejavu.json          |   6 +-
 .../stMemoryTest/calldatacopy_dejavu2.json         |   6 +-
 .../stMemoryTest/codecopy_dejavu.json              |   6 +-
 .../stMemoryTest/codecopy_dejavu2.json             |   6 +-
 .../stMemoryTest/extcodecopy_dejavu.json           |   6 +-
 GeneralStateTests/stMemoryTest/log1_dejavu.json    |   6 +-
 GeneralStateTests/stMemoryTest/log2_dejavu.json    |   6 +-
 GeneralStateTests/stMemoryTest/log3_dejavu.json    |   6 +-
 GeneralStateTests/stMemoryTest/log4_dejavu.json    |   6 +-
 .../stMemoryTest/mem0b_singleByte.json             |   6 +-
 .../stMemoryTest/mem31b_singleByte.json            |   6 +-
 .../stMemoryTest/mem32b_singleByte.json            |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb+1.json      |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb+31.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb+32.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb+33.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb-1.json      |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb-31.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb-32.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb-33.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem32kb.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte+1.json         |   6 +-
 .../stMemoryTest/mem32kb_singleByte+31.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte+32.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte+33.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte-1.json         |   6 +-
 .../stMemoryTest/mem32kb_singleByte-31.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte-32.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte-33.json        |   6 +-
 .../stMemoryTest/mem32kb_singleByte.json           |   6 +-
 .../stMemoryTest/mem33b_singleByte.json            |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb+1.json      |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb+31.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb+32.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb+33.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb-1.json      |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb-31.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb-32.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb-33.json     |   6 +-
 GeneralStateTests/stMemoryTest/mem64kb.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte+1.json         |   6 +-
 .../stMemoryTest/mem64kb_singleByte+31.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte+32.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte+33.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte-1.json         |   6 +-
 .../stMemoryTest/mem64kb_singleByte-31.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte-32.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte-33.json        |   6 +-
 .../stMemoryTest/mem64kb_singleByte.json           |   6 +-
 GeneralStateTests/stMemoryTest/memReturn.json      |   6 +-
 .../stMemoryTest/mload16bitBound.json              |   6 +-
 GeneralStateTests/stMemoryTest/mload8bitBound.json |   6 +-
 GeneralStateTests/stMemoryTest/mload_dejavu.json   |   6 +-
 GeneralStateTests/stMemoryTest/mstore_dejavu.json  |   6 +-
 GeneralStateTests/stMemoryTest/mstroe8_dejavu.json |   6 +-
 GeneralStateTests/stMemoryTest/sha3_dejavu.json    |   6 +-
 .../stMemoryTest/stackLimitGas_1023.json           |   6 +-
 .../stMemoryTest/stackLimitGas_1024.json           |   6 +-
 .../stMemoryTest/stackLimitGas_1025.json           |   6 +-
 .../stMemoryTest/stackLimitPush31_1023.json        |   6 +-
 .../stMemoryTest/stackLimitPush31_1024.json        |   6 +-
 .../stMemoryTest/stackLimitPush31_1025.json        |   6 +-
 .../stMemoryTest/stackLimitPush32_1023.json        |   6 +-
 .../stMemoryTest/stackLimitPush32_1024.json        |   6 +-
 .../stMemoryTest/stackLimitPush32_1025.json        |   6 +-
 .../stNonZeroCallsTest/NonZeroValue_CALL.json      |   6 +-
 .../stNonZeroCallsTest/NonZeroValue_CALLCODE.json  |   6 +-
 .../NonZeroValue_CALLCODE_ToEmpty.json             |   6 +-
 .../NonZeroValue_CALLCODE_ToNonNonZeroBalance.json |   6 +-
 .../NonZeroValue_CALLCODE_ToOneStorageKey.json     |   6 +-
 .../NonZeroValue_CALL_ToEmpty.json                 |   6 +-
 .../NonZeroValue_CALL_ToNonNonZeroBalance.json     |   6 +-
 .../NonZeroValue_CALL_ToOneStorageKey.json         |   6 +-
 .../NonZeroValue_DELEGATECALL.json                 |   6 +-
 .../NonZeroValue_DELEGATECALL_ToEmpty.json         |   6 +-
 ...ZeroValue_DELEGATECALL_ToNonNonZeroBalance.json |   6 +-
 .../NonZeroValue_DELEGATECALL_ToOneStorageKey.json |   6 +-
 .../stNonZeroCallsTest/NonZeroValue_SUICIDE.json   |   6 +-
 .../NonZeroValue_SUICIDE_ToEmpty.json              |   6 +-
 .../NonZeroValue_SUICIDE_ToNonNonZeroBalance.json  |   6 +-
 .../NonZeroValue_SUICIDE_ToOneStorageKey.json      |   6 +-
 .../NonZeroValue_TransactionCALL.json              |   6 +-
 .../NonZeroValue_TransactionCALL_ToEmpty.json      |   6 +-
 ...oValue_TransactionCALL_ToNonNonZeroBalance.json |   6 +-
 ...nZeroValue_TransactionCALL_ToOneStorageKey.json |   6 +-
 .../NonZeroValue_TransactionCALLwithData.json      |   6 +-
 ...nZeroValue_TransactionCALLwithData_ToEmpty.json |   6 +-
 ...ransactionCALLwithData_ToNonNonZeroBalance.json |   6 +-
 ...ue_TransactionCALLwithData_ToOneStorageKey.json |   6 +-
 .../stPreCompiledContracts/CALLCODEEcrecover0.json |   6 +-
 .../CALLCODEEcrecover0_0input.json                 |   6 +-
 .../CALLCODEEcrecover0_Gas2999.json                |   6 +-
 .../CALLCODEEcrecover0_NoGas.json                  |   6 +-
 .../CALLCODEEcrecover0_completeReturnValue.json    |   6 +-
 .../CALLCODEEcrecover0_gas3000.json                |   6 +-
 .../CALLCODEEcrecover0_overlappingInputOutput.json |   6 +-
 .../stPreCompiledContracts/CALLCODEEcrecover1.json |   6 +-
 .../stPreCompiledContracts/CALLCODEEcrecover2.json |   6 +-
 .../stPreCompiledContracts/CALLCODEEcrecover3.json |   6 +-
 .../CALLCODEEcrecover80.json                       |   6 +-
 .../CALLCODEEcrecoverH_prefixed0.json              |   6 +-
 .../CALLCODEEcrecoverR_prefixed0.json              |   6 +-
 .../CALLCODEEcrecoverS_prefixed0.json              |   6 +-
 .../CALLCODEEcrecoverV_prefixed0.json              |   6 +-
 .../CALLCODEIdentitiy_0.json                       |   6 +-
 .../CALLCODEIdentitiy_1.json                       |   6 +-
 .../CALLCODEIdentity_1_nonzeroValue.json           |   6 +-
 .../stPreCompiledContracts/CALLCODEIdentity_2.json |   6 +-
 .../stPreCompiledContracts/CALLCODEIdentity_3.json |   6 +-
 .../stPreCompiledContracts/CALLCODEIdentity_4.json |   6 +-
 .../CALLCODEIdentity_4_gas17.json                  |   6 +-
 .../CALLCODEIdentity_4_gas18.json                  |   6 +-
 .../stPreCompiledContracts/CALLCODEIdentity_5.json |   6 +-
 .../CALLCODERipemd160_0.json                       |   6 +-
 .../CALLCODERipemd160_1.json                       |   6 +-
 .../CALLCODERipemd160_2.json                       |   6 +-
 .../CALLCODERipemd160_3.json                       |   6 +-
 .../CALLCODERipemd160_3_postfixed0.json            |   6 +-
 .../CALLCODERipemd160_3_prefixed0.json             |   6 +-
 .../CALLCODERipemd160_4.json                       |   6 +-
 .../CALLCODERipemd160_4_gas719.json                |   6 +-
 .../CALLCODERipemd160_5.json                       |   6 +-
 .../stPreCompiledContracts/CALLCODESha256_0.json   |   6 +-
 .../stPreCompiledContracts/CALLCODESha256_1.json   |   6 +-
 .../CALLCODESha256_1_nonzeroValue.json             |   6 +-
 .../stPreCompiledContracts/CALLCODESha256_2.json   |   6 +-
 .../stPreCompiledContracts/CALLCODESha256_3.json   |   6 +-
 .../CALLCODESha256_3_postfix0.json                 |   6 +-
 .../CALLCODESha256_3_prefix0.json                  |   6 +-
 .../stPreCompiledContracts/CALLCODESha256_4.json   |   6 +-
 .../CALLCODESha256_4_gas99.json                    |   6 +-
 .../stPreCompiledContracts/CALLCODESha256_5.json   |   6 +-
 .../stPreCompiledContracts/CallEcrecover0.json     |   6 +-
 .../CallEcrecover0_0input.json                     |   6 +-
 .../CallEcrecover0_Gas2999.json                    |   6 +-
 .../CallEcrecover0_NoGas.json                      |   6 +-
 .../CallEcrecover0_completeReturnValue.json        |   6 +-
 .../CallEcrecover0_gas3000.json                    |   6 +-
 .../CallEcrecover0_overlappingInputOutput.json     |   6 +-
 .../stPreCompiledContracts/CallEcrecover1.json     |   6 +-
 .../stPreCompiledContracts/CallEcrecover2.json     |   6 +-
 .../stPreCompiledContracts/CallEcrecover3.json     |   6 +-
 .../stPreCompiledContracts/CallEcrecover80.json    |   6 +-
 .../CallEcrecoverCheckLength.json                  |   6 +-
 .../CallEcrecoverCheckLengthWrongV.json            |   6 +-
 .../CallEcrecoverH_prefixed0.json                  |   6 +-
 .../CallEcrecoverR_prefixed0.json                  |   6 +-
 .../CallEcrecoverS_prefixed0.json                  |   6 +-
 .../CallEcrecoverV_prefixed0.json                  |   6 +-
 .../stPreCompiledContracts/CallIdentitiy_0.json    |   6 +-
 .../stPreCompiledContracts/CallIdentitiy_1.json    |   6 +-
 .../CallIdentity_1_nonzeroValue.json               |   6 +-
 .../stPreCompiledContracts/CallIdentity_2.json     |   6 +-
 .../stPreCompiledContracts/CallIdentity_3.json     |   6 +-
 .../stPreCompiledContracts/CallIdentity_4.json     |   6 +-
 .../CallIdentity_4_gas17.json                      |   6 +-
 .../CallIdentity_4_gas18.json                      |   6 +-
 .../stPreCompiledContracts/CallIdentity_5.json     |   6 +-
 .../stPreCompiledContracts/CallRipemd160_0.json    |   6 +-
 .../stPreCompiledContracts/CallRipemd160_1.json    |   6 +-
 .../stPreCompiledContracts/CallRipemd160_2.json    |   6 +-
 .../stPreCompiledContracts/CallRipemd160_3.json    |   6 +-
 .../CallRipemd160_3_postfixed0.json                |   6 +-
 .../CallRipemd160_3_prefixed0.json                 |   6 +-
 .../stPreCompiledContracts/CallRipemd160_4.json    |   6 +-
 .../CallRipemd160_4_gas719.json                    |   6 +-
 .../stPreCompiledContracts/CallRipemd160_5.json    |   6 +-
 .../stPreCompiledContracts/CallSha256_0.json       |   6 +-
 .../stPreCompiledContracts/CallSha256_1.json       |   6 +-
 .../CallSha256_1_nonzeroValue.json                 |   6 +-
 .../stPreCompiledContracts/CallSha256_2.json       |   6 +-
 .../stPreCompiledContracts/CallSha256_3.json       |   6 +-
 .../CallSha256_3_postfix0.json                     |   6 +-
 .../CallSha256_3_prefix0.json                      |   6 +-
 .../stPreCompiledContracts/CallSha256_4.json       |   6 +-
 .../stPreCompiledContracts/CallSha256_4_gas99.json |   6 +-
 .../stPreCompiledContracts/CallSha256_5.json       |   6 +-
 .../stPreCompiledContracts/sec80.json              |   6 +-
 .../stRecursiveCreate/recursiveCreate.json         |   6 +-
 .../recursiveCreateReturnValue.json                |   6 +-
 GeneralStateTests/stRefundTest/refund50_1.json     |   6 +-
 GeneralStateTests/stRefundTest/refund50_2.json     |   6 +-
 .../stRefundTest/refund50percentCap.json           |   6 +-
 GeneralStateTests/stRefundTest/refund600.json      |   6 +-
 .../stRefundTest/refundSuicide50procentCap.json    |   6 +-
 GeneralStateTests/stRefundTest/refund_CallA.json   |   6 +-
 .../stRefundTest/refund_CallA_OOG.json             |   6 +-
 .../refund_CallA_notEnoughGasInCall.json           |   6 +-
 .../refund_CallToSuicideNoStorage.json             |   6 +-
 .../stRefundTest/refund_CallToSuicideStorage.json  |   6 +-
 .../stRefundTest/refund_CallToSuicideTwice.json    |   6 +-
 GeneralStateTests/stRefundTest/refund_NoOOG_1.json |   6 +-
 GeneralStateTests/stRefundTest/refund_OOG.json     |   6 +-
 .../stRefundTest/refund_TxToSuicide.json           |   6 +-
 .../stRefundTest/refund_TxToSuicideOOG.json        |   6 +-
 .../stRefundTest/refund_changeNonZeroStorage.json  |   6 +-
 .../stRefundTest/refund_getEtherBack.json          |   6 +-
 .../stRefundTest/refund_multimpleSuicide.json      |   6 +-
 .../stRefundTest/refund_singleSuicide.json         |   6 +-
 .../stRevertTest/LoopCallsDepthThenRevert.json     |   6 +-
 .../stRevertTest/LoopCallsDepthThenRevert2.json    |   6 +-
 .../stRevertTest/LoopCallsDepthThenRevert3.json    |   6 +-
 .../stRevertTest/LoopCallsThenRevert.json          |   6 +-
 .../LoopDelegateCallsDepthThenRevert.json          |   6 +-
 .../stRevertTest/NashatyrevSuicideRevert.json      |   6 +-
 GeneralStateTests/stRevertTest/RevertDepth2.json   |   6 +-
 .../RevertDepthCreateAddressCollision.json         |   6 +-
 .../stRevertTest/RevertDepthCreateOOG.json         |   6 +-
 GeneralStateTests/stRevertTest/RevertPrefound.json |   6 +-
 .../stRevertTest/RevertPrefoundCall.json           |   6 +-
 .../stRevertTest/RevertPrefoundCallOOG.json        |   6 +-
 .../stRevertTest/RevertPrefoundEmpty.json          |   6 +-
 .../stRevertTest/RevertPrefoundEmptyCall.json      |   6 +-
 .../stRevertTest/RevertPrefoundEmptyCallOOG.json   |   6 +-
 .../stRevertTest/RevertPrefoundEmptyOOG.json       |   6 +-
 .../stRevertTest/RevertPrefoundOOG.json            |   6 +-
 .../RevertRemoteSubCallStorageOOG.json             |   6 +-
 .../RevertRemoteSubCallStorageOOG2.json            |   6 +-
 .../stRevertTest/RevertSubCallStorageOOG.json      |   6 +-
 .../stRevertTest/RevertSubCallStorageOOG2.json     |   6 +-
 .../stRevertTest/TouchToEmptyAccountRevert.json    |   6 +-
 .../stRevertTest/TouchToEmptyAccountRevert2.json   |   6 +-
 .../stRevertTest/TouchToEmptyAccountRevert3.json   |   6 +-
 .../stSolidityTest/AmbiguousMethod.json            |   6 +-
 .../stSolidityTest/CallInfiniteLoop.json           |   6 +-
 .../CallLowLevelCreatesSolidity.json               |   6 +-
 .../stSolidityTest/CallRecursiveMethods.json       |   6 +-
 .../stSolidityTest/ContractInheritance.json        |   6 +-
 .../stSolidityTest/CreateContractFromMethod.json   |   6 +-
 .../stSolidityTest/RecursiveCreateContracts.json   |   6 +-
 .../RecursiveCreateContractsCreate4Contracts.json  |   6 +-
 .../TestBlockAndTransactionProperties.json         |  14 +-
 .../stSolidityTest/TestContractInteraction.json    |   6 +-
 .../stSolidityTest/TestContractSuicide.json        |   6 +-
 .../stSolidityTest/TestCryptographicFunctions.json |   6 +-
 GeneralStateTests/stSolidityTest/TestKeywords.json |   6 +-
 GeneralStateTests/stSolidityTest/TestOverflow.json |   6 +-
 .../stSolidityTest/TestStoreGasPrices.json         |   6 +-
 .../TestStructuresAndVariabless.json               |   6 +-
 .../stSpecialTest/BadStateRootTx.json              |   6 +-
 .../stSpecialTest/JUMPDEST_Attack.json             |   6 +-
 .../stSpecialTest/JUMPDEST_AttackwithJump.json     |   6 +-
 .../stSpecialTest/OverflowGasMakeMoney.json        |   6 +-
 .../stSpecialTest/StackDepthLimitSEC.json          |   6 +-
 GeneralStateTests/stSpecialTest/block504980.json   |  14 +-
 GeneralStateTests/stSpecialTest/gasPrice0.json     |   6 +-
 GeneralStateTests/stSpecialTest/makeMoney.json     |   6 +-
 GeneralStateTests/stSpecialTest/sha3_deja.json     |   6 +-
 GeneralStateTests/stSpecialTest/txCost-sec73.json  |   6 +-
 GeneralStateTests/stSpecialTest/tx_e1c174e2.json   |   6 +-
 .../stSystemOperationsTest/ABAcalls0.json          |   6 +-
 .../stSystemOperationsTest/ABAcalls1.json          |   6 +-
 .../stSystemOperationsTest/ABAcalls2.json          |   6 +-
 .../stSystemOperationsTest/ABAcalls3.json          |   6 +-
 .../stSystemOperationsTest/ABAcallsSuicide0.json   |   6 +-
 .../stSystemOperationsTest/ABAcallsSuicide1.json   |   6 +-
 .../stSystemOperationsTest/Call10.json             |   6 +-
 .../stSystemOperationsTest/CallRecursiveBomb0.json |   6 +-
 .../CallRecursiveBomb0_OOG_atMaxCallDepth.json     |   6 +-
 .../stSystemOperationsTest/CallRecursiveBomb1.json |   6 +-
 .../stSystemOperationsTest/CallRecursiveBomb2.json |   6 +-
 .../stSystemOperationsTest/CallRecursiveBomb3.json |   6 +-
 .../CallRecursiveBombLog.json                      |   6 +-
 .../CallRecursiveBombLog2.json                     |   6 +-
 .../CallToNameRegistrator0.json                    |   6 +-
 .../CallToNameRegistratorAddressTooBigLeft.json    |   6 +-
 .../CallToNameRegistratorAddressTooBigRight.json   |   6 +-
 ...ameRegistratorMemOOGAndInsufficientBalance.json |   6 +-
 .../CallToNameRegistratorNotMuchMemory0.json       |   6 +-
 .../CallToNameRegistratorNotMuchMemory1.json       |   6 +-
 .../CallToNameRegistratorOutOfGas.json             |   6 +-
 .../CallToNameRegistratorTooMuchMemory0.json       |   6 +-
 .../CallToNameRegistratorTooMuchMemory1.json       |   6 +-
 .../CallToNameRegistratorTooMuchMemory2.json       |   6 +-
 .../CallToNameRegistratorZeorSizeMemExpansion.json |   6 +-
 .../stSystemOperationsTest/CallToReturn1.json      |   6 +-
 .../CallToReturn1ForDynamicJump0.json              |   6 +-
 .../CallToReturn1ForDynamicJump1.json              |   6 +-
 .../stSystemOperationsTest/CalltoReturn2.json      |   6 +-
 .../CreateHashCollision.json                       |   6 +-
 .../stSystemOperationsTest/PostToReturn1.json      |   6 +-
 .../TestNameRegistrator.json                       |   6 +-
 .../balanceInputAddressTooBig.json                 |   6 +-
 .../stSystemOperationsTest/callValue.json          |   6 +-
 .../stSystemOperationsTest/callcodeTo0.json        |   6 +-
 .../callcodeToNameRegistrator0.json                |   6 +-
 .../callcodeToNameRegistratorAddresTooBigLeft.json |   6 +-
 ...callcodeToNameRegistratorAddresTooBigRight.json |   6 +-
 .../callcodeToNameRegistratorZeroMemExpanion.json  |   6 +-
 .../stSystemOperationsTest/callcodeToReturn1.json  |   6 +-
 .../callerAccountBalance.json                      |   6 +-
 .../createNameRegistrator.json                     |   6 +-
 .../createNameRegistratorOOG_MemExpansionOOV.json  |   6 +-
 .../createNameRegistratorOutOfMemoryBonds0.json    |   6 +-
 .../createNameRegistratorOutOfMemoryBonds1.json    |   6 +-
 .../createNameRegistratorValueTooHigh.json         |   6 +-
 .../createNameRegistratorZeroMem.json              |   6 +-
 .../createNameRegistratorZeroMem2.json             |   6 +-
 .../createNameRegistratorZeroMemExpansion.json     |   6 +-
 .../createWithInvalidOpcode.json                   |  10 +-
 .../currentAccountBalance.json                     |   6 +-
 .../stSystemOperationsTest/extcodecopy.json        |   6 +-
 .../stSystemOperationsTest/return0.json            |   6 +-
 .../stSystemOperationsTest/return1.json            |   6 +-
 .../stSystemOperationsTest/return2.json            |   6 +-
 .../stSystemOperationsTest/suicideAddress.json     |   6 +-
 .../stSystemOperationsTest/suicideCaller.json      |   6 +-
 .../suicideCallerAddresTooBigLeft.json             |   6 +-
 .../suicideCallerAddresTooBigRight.json            |   6 +-
 .../stSystemOperationsTest/suicideCoinbase.json    |   6 +-
 .../suicideNotExistingAccount.json                 |   6 +-
 .../stSystemOperationsTest/suicideOrigin.json      |   6 +-
 .../suicideSendEtherPostDeath.json                 |   6 +-
 .../suicideSendEtherToMe.json                      |   6 +-
 .../stSystemOperationsTest/testRandomTest.json     |  14 +-
 .../stTransactionTest/ContractStoreClearsOOG.json  |   6 +-
 .../ContractStoreClearsSuccess.json                |   6 +-
 .../stTransactionTest/CreateMessageReverted.json   |   6 +-
 .../stTransactionTest/CreateMessageSuccess.json    |   6 +-
 .../CreateTransactionReverted.json                 |   6 +-
 .../CreateTransactionSuccess.json                  |   6 +-
 .../stTransactionTest/EmptyTransaction.json        |   6 +-
 .../stTransactionTest/EmptyTransaction2.json       |   6 +-
 .../stTransactionTest/EmptyTransaction3.json       |   6 +-
 .../stTransactionTest/HighGasLimit.json            |   6 +-
 .../InternalCallHittingGasLimit.json               |   6 +-
 .../InternalCallHittingGasLimit2.json              |   6 +-
 .../InternalCallHittingGasLimitSuccess.json        |   6 +-
 .../InternlCallStoreClearsOOG.json                 |   6 +-
 .../InternlCallStoreClearsSucces.json              |   6 +-
 .../stTransactionTest/OverflowGasRequire.json      |   6 +-
 .../stTransactionTest/OverflowGasRequire2.json     |   6 +-
 .../stTransactionTest/RefundOverflow.json          |   6 +-
 .../stTransactionTest/RefundOverflow2.json         |   6 +-
 .../StoreClearsAndInternlCallStoreClearsOOG.json   |   6 +-
 ...toreClearsAndInternlCallStoreClearsSuccess.json |   6 +-
 .../stTransactionTest/StoreGasOnCreate.json        |   6 +-
 ...icidesAndInternlCallSuicidesBonusGasAtCall.json |   6 +-
 ...AndInternlCallSuicidesBonusGasAtCallFailed.json |   6 +-
 .../SuicidesAndInternlCallSuicidesOOG.json         |   6 +-
 .../SuicidesAndInternlCallSuicidesSuccess.json     |   6 +-
 ...SuicidesAndSendMoneyToItselfEtherDestroyed.json |   6 +-
 .../stTransactionTest/SuicidesMixingCoinbase.json  |   6 +-
 .../SuicidesStopAfterSuicide.json                  |   6 +-
 .../stTransactionTest/TransactionDataCosts652.json |   6 +-
 ...ransactionFromCoinbaseHittingBlockGasLimit.json |   6 +-
 ...ansactionFromCoinbaseHittingBlockGasLimit1.json |   6 +-
 .../TransactionFromCoinbaseNotEnoughFounds.json    |   8 +-
 .../stTransactionTest/TransactionNonceCheck.json   |   6 +-
 .../stTransactionTest/TransactionNonceCheck2.json  |   6 +-
 .../TransactionSendingToEmpty.json                 |   6 +-
 .../TransactionSendingToZero.json                  |   6 +-
 .../TransactionToAddressh160minusOne.json          |   6 +-
 .../stTransactionTest/TransactionToItself.json     |   6 +-
 .../TransactionToItselfNotEnoughFounds.json        |   6 +-
 ...serTransactionGasLimitIsTooLowWhenZeroCost.json |   6 +-
 .../stTransactionTest/UserTransactionZeroCost.json |   6 +-
 .../UserTransactionZeroCostWithData.json           |   6 +-
 .../createNameRegistratorPerTxsAfter.json          |   4 +-
 .../createNameRegistratorPerTxsAt.json             |   6 +-
 .../createNameRegistratorPerTxsBefore.json         |   4 +-
 ...eateNameRegistratorPerTxsNotEnoughGasAfter.json |   4 +-
 .../createNameRegistratorPerTxsNotEnoughGasAt.json |   6 +-
 ...ateNameRegistratorPerTxsNotEnoughGasBefore.json |   4 +-
 .../delegatecallAfterTransition.json               |   4 +-
 .../stTransitionTest/delegatecallAtTransition.json |   6 +-
 .../delegatecallBeforeTransition.json              |   4 +-
 .../stWalletTest/dayLimitConstruction.json         |  24 +-
 .../stWalletTest/dayLimitConstructionOOG.json      |  10 +-
 .../stWalletTest/dayLimitConstructionPartial.json  |  16 +-
 .../stWalletTest/dayLimitResetSpentToday.json      |   8 +-
 .../stWalletTest/dayLimitSetDailyLimit.json        |   8 +-
 .../stWalletTest/dayLimitSetDailyLimitNoData.json  |   8 +-
 .../stWalletTest/multiOwnedAddOwner.json           |   8 +-
 .../stWalletTest/multiOwnedAddOwnerAddMyself.json  |   8 +-
 .../stWalletTest/multiOwnedChangeOwner.json        |   8 +-
 .../multiOwnedChangeOwnerNoArgument.json           |   6 +-
 .../multiOwnedChangeOwner_fromNotOwner.json        |   8 +-
 .../multiOwnedChangeOwner_toIsOwner.json           |   8 +-
 .../multiOwnedChangeRequirementTo0.json            |   8 +-
 .../multiOwnedChangeRequirementTo1.json            |   8 +-
 .../multiOwnedChangeRequirementTo2.json            |   8 +-
 .../multiOwnedConstructionCorrect.json             |   8 +-
 .../multiOwnedConstructionNotEnoughGas.json        |   8 +-
 .../multiOwnedConstructionNotEnoughGasPartial.json |   8 +-
 .../stWalletTest/multiOwnedIsOwnerFalse.json       |   8 +-
 .../stWalletTest/multiOwnedIsOwnerTrue.json        |   8 +-
 .../stWalletTest/multiOwnedRemoveOwner.json        |   8 +-
 .../multiOwnedRemoveOwnerByNonOwner.json           |   8 +-
 .../stWalletTest/multiOwnedRemoveOwner_mySelf.json |   8 +-
 .../multiOwnedRemoveOwner_ownerIsNotOwner.json     |   8 +-
 .../stWalletTest/multiOwnedRevokeNothing.json      |   8 +-
 .../walletAddOwnerRemovePendingTransaction.json    |   8 +-
 .../walletChangeOwnerRemovePendingTransaction.json |   8 +-
 ...tChangeRequirementRemovePendingTransaction.json |   8 +-
 GeneralStateTests/stWalletTest/walletConfirm.json  |   8 +-
 .../stWalletTest/walletConstruction.json           |  24 +-
 .../stWalletTest/walletConstructionOOG.json        |  18 +-
 .../stWalletTest/walletConstructionPartial.json    |  16 +-
 GeneralStateTests/stWalletTest/walletDefault.json  |   8 +-
 .../stWalletTest/walletDefaultWithOutValue.json    |   8 +-
 .../walletExecuteOverDailyLimitMultiOwner.json     |  16 +-
 .../walletExecuteOverDailyLimitOnlyOneOwner.json   |  16 +-
 ...walletExecuteOverDailyLimitOnlyOneOwnerNew.json |  16 +-
 .../stWalletTest/walletExecuteUnderDailyLimit.json |  16 +-
 GeneralStateTests/stWalletTest/walletKill.json     |   8 +-
 .../stWalletTest/walletKillNotByOwner.json         |   8 +-
 .../stWalletTest/walletKillToWallet.json           |   8 +-
 .../walletRemoveOwnerRemovePendingTransaction.json |   8 +-
 .../ZeroValue_CALLCODE_OOGRevert.json              |   6 +-
 .../ZeroValue_CALLCODE_ToEmpty_OOGRevert.json      |   6 +-
 ...oValue_CALLCODE_ToNonZeroBalance_OOGRevert.json |   6 +-
 ...roValue_CALLCODE_ToOneStorageKey_OOGRevert.json |   6 +-
 .../ZeroValue_CALL_OOGRevert.json                  |   6 +-
 .../ZeroValue_CALL_ToEmpty_OOGRevert.json          |   6 +-
 .../ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json |   6 +-
 .../ZeroValue_CALL_ToOneStorageKey_OOGRevert.json  |   6 +-
 .../ZeroValue_DELEGATECALL_OOGRevert.json          |   6 +-
 .../ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json  |   6 +-
 ...ue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json |   6 +-
 ...lue_DELEGATECALL_ToOneStorageKey_OOGRevert.json |   6 +-
 .../ZeroValue_SUICIDE_OOGRevert.json               |   6 +-
 .../ZeroValue_SUICIDE_ToEmpty_OOGRevert.json       |   6 +-
 ...roValue_SUICIDE_ToNonZeroBalance_OOGRevert.json |   6 +-
 ...eroValue_SUICIDE_ToOneStorageKey_OOGRevert.json |   6 +-
 .../ZeroValue_TransactionCALL_OOGRevert.json       |   6 +-
 ...eroValue_TransactionCALL_ToEmpty_OOGRevert.json |   6 +-
 ...TransactionCALL_ToNonZeroBalance_OOGRevert.json |   6 +-
 ..._TransactionCALL_ToOneStorageKey_OOGRevert.json |   6 +-
 ...eroValue_TransactionCALLwithData_OOGRevert.json |   6 +-
 ..._TransactionCALLwithData_ToEmpty_OOGRevert.json |   6 +-
 ...ionCALLwithData_ToNonZeroBalance_OOGRevert.json |   6 +-
 ...tionCALLwithData_ToOneStorageKey_OOGRevert.json |   6 +-
 .../stZeroCallsTest/ZeroValue_CALL.json            |   6 +-
 .../stZeroCallsTest/ZeroValue_CALLCODE.json        |   6 +-
 .../ZeroValue_CALLCODE_ToEmpty.json                |   6 +-
 .../ZeroValue_CALLCODE_ToNonZeroBalance.json       |   6 +-
 .../ZeroValue_CALLCODE_ToOneStorageKey.json        |   6 +-
 .../stZeroCallsTest/ZeroValue_CALL_ToEmpty.json    |   6 +-
 .../ZeroValue_CALL_ToNonZeroBalance.json           |   6 +-
 .../ZeroValue_CALL_ToOneStorageKey.json            |   6 +-
 .../stZeroCallsTest/ZeroValue_DELEGATECALL.json    |   6 +-
 .../ZeroValue_DELEGATECALL_ToEmpty.json            |   6 +-
 .../ZeroValue_DELEGATECALL_ToNonZeroBalance.json   |   6 +-
 .../ZeroValue_DELEGATECALL_ToOneStorageKey.json    |   6 +-
 .../stZeroCallsTest/ZeroValue_SUICIDE.json         |   6 +-
 .../stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json |   6 +-
 .../ZeroValue_SUICIDE_ToNonZeroBalance.json        |   6 +-
 .../ZeroValue_SUICIDE_ToOneStorageKey.json         |   6 +-
 .../stZeroCallsTest/ZeroValue_TransactionCALL.json |   6 +-
 .../ZeroValue_TransactionCALL_ToEmpty.json         |   6 +-
 ...ZeroValue_TransactionCALL_ToNonZeroBalance.json |   6 +-
 .../ZeroValue_TransactionCALL_ToOneStorageKey.json |   6 +-
 .../ZeroValue_TransactionCALLwithData.json         |   6 +-
 .../ZeroValue_TransactionCALLwithData_ToEmpty.json |   6 +-
 ...e_TransactionCALLwithData_ToNonZeroBalance.json |   6 +-
 ...ue_TransactionCALLwithData_ToOneStorageKey.json |   6 +-
 951 files changed, 3660 insertions(+), 2988 deletions(-)

diff --git a/GeneralStateTests/stAttackTest/ContractCreationSpam.json b/GeneralStateTests/stAttackTest/ContractCreationSpam.json
index b72d6f949..7dc80dd91 100644
--- a/GeneralStateTests/stAttackTest/ContractCreationSpam.json
+++ b/GeneralStateTests/stAttackTest/ContractCreationSpam.json
@@ -2,10 +2,10 @@
     "ContractCreationSpam" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
-            "currentNumber" : "0x24f303",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBlockHashTest/blockhash0.json b/GeneralStateTests/stBlockHashTest/blockhash0.json
index eea234fc1..009030991 100644
--- a/GeneralStateTests/stBlockHashTest/blockhash0.json
+++ b/GeneralStateTests/stBlockHashTest/blockhash0.json
@@ -2,44 +2,140 @@
     "blockhash0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
-            "currentNumber" : "0x05",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
@@ -61,35 +157,131 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
@@ -111,35 +303,131 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
@@ -161,35 +449,131 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "3e6dacc1575c6a8c76422255eca03529bbf4c0dda75dfc110b22d6dc4152396f",
+                    "hash" : "7dde00b2e7aea44866286f955462fedcb613e3b41303ef7e5c269cef5346247f",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
-                    "hash" : "99a450d8ce5b987a71346d8a0a1203711f770745c7ef326912e46761f14cd764",
+                    "hash" : "589fd4b64c670b0b1bc0afa275912befbdcba04749cbcc31f14e3746ebb82d06",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
                         "value" : 1
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x600040600055600540600155600440600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7aba",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 },
                 {
diff --git a/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json b/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json
index 886fc44d7..1abcc0a24 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashDOS-sec71.json
@@ -2,10 +2,10 @@
     "blockhashDOS-sec71" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x0101",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBlockHashTest/blockhashInRange.json b/GeneralStateTests/stBlockHashTest/blockhashInRange.json
index 83e237d53..233e460b3 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashInRange.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashInRange.json
@@ -2,50 +2,146 @@
     "blockhashInRange" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x0101",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ab8432acf840bc3cff40a4bce7a59639712bd74e6243144879d41ccc33d10564",
+                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x60004060005560024060015561010040600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "ab8432acf840bc3cff40a4bce7a59639712bd74e6243144879d41ccc33d10564",
+                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x60004060005560024060015561010040600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "ab8432acf840bc3cff40a4bce7a59639712bd74e6243144879d41ccc33d10564",
+                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x60004060005560024060015561010040600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "ab8432acf840bc3cff40a4bce7a59639712bd74e6243144879d41ccc33d10564",
+                    "hash" : "fb1c9b7caeafea4ac77fe6fe63a93d9e815ad46f077ddb97ad5af252c797848b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x60004060005560024060015561010040600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e7ab0",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ]
@@ -53,7 +149,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60014060005560024060015561010040600255",
+                "code" : "0x60004060005560024060015561010040600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/GeneralStateTests/stBlockHashTest/blockhashJIT.json b/GeneralStateTests/stBlockHashTest/blockhashJIT.json
index 8325745c0..f37c24c9a 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashJIT.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashJIT.json
@@ -2,10 +2,10 @@
     "blockhashJIT" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
-            "currentNumber" : "0x05",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
@@ -16,6 +16,30 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x6000406000556801000000000000000140600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb3e4",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e8e52",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
@@ -26,6 +50,30 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x6000406000556801000000000000000140600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb3e4",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e8e52",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
@@ -36,6 +84,30 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x6000406000556801000000000000000140600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb3e4",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e8e52",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
@@ -46,6 +118,30 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x6000406000556801000000000000000140600155",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xb3e4",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0e8e52",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ]
diff --git a/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json b/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json
index 3a7a57b2b..61738890f 100644
--- a/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json
+++ b/GeneralStateTests/stBlockHashTest/blockhashOutOfRange.json
@@ -2,50 +2,146 @@
     "blockhashOutOfRange" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x0101",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "2a12af36bb359a981bcefc9256eb5fbed4acad1c27be59c2f726b547dfafec2a",
+                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x39f780",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "EIP158" : [
                 {
-                    "hash" : "2a12af36bb359a981bcefc9256eb5fbed4acad1c27be59c2f726b547dfafec2a",
+                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x39f780",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Frontier" : [
                 {
-                    "hash" : "2a12af36bb359a981bcefc9256eb5fbed4acad1c27be59c2f726b547dfafec2a",
+                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x39f780",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
             "Homestead" : [
                 {
-                    "hash" : "2a12af36bb359a981bcefc9256eb5fbed4acad1c27be59c2f726b547dfafec2a",
+                    "hash" : "4e785c13d8eb1e675e75608830b914bd16754c6d432abcdbee2362563d00dfd1",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a764000a",
+                            "code" : "0x600040600055610101406001557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xc786",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x39f780",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ]
diff --git a/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json b/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
index 4a2601e3e..d517992b6 100644
--- a/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
@@ -2,16 +2,16 @@
     "BLOCKHASH_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json b/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
index 6cbb70586..030a9b480 100644
--- a/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
@@ -2,16 +2,16 @@
     "BLOCKHASH_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "hash" : "aa2ef5f4613acf86fcdfa078bf9147bc03ee00b4332f28068b6273755e470d44",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
index 3bf5d67ec..2ceb7b648 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
index 82d5237d9..136cd182c 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
index 681740d42..60c9e375c 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
index 36b214deb..b4f7a04ac 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
@@ -2,10 +2,10 @@
     "CALLCODE_Bounds4OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
index 804867b9a..d6064ab43 100644
--- a/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
@@ -2,10 +2,10 @@
     "CALLCODE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
index 03863778f..1dc722c1c 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
@@ -2,10 +2,10 @@
     "CALL_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
index 678f06c80..db743ed00 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
@@ -2,10 +2,10 @@
     "CALL_Bounds2aOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds3.json b/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
index 568a29662..39a9e229b 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
@@ -2,10 +2,10 @@
     "CALL_Bounds3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
index 03542fcd6..02150fa43 100644
--- a/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
@@ -2,10 +2,10 @@
     "CALL_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
index 5373b1e0e..34db4bb9d 100644
--- a/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
@@ -2,10 +2,10 @@
     "CALL_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
index 7361a2a1c..9c2d06363 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
@@ -2,10 +2,10 @@
     "CREATE_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
index 2ebb13cd3..6645159d5 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
@@ -2,10 +2,10 @@
     "CREATE_Bounds3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
index 47a8e279c..acb47aae7 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
@@ -2,10 +2,10 @@
     "CREATE_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
index 92cd85a12..d9b99e92d 100644
--- a/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
@@ -2,10 +2,10 @@
     "CREATE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
index f2ba27cfe..6f2241a34 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
index 0dabbeef6..a14d28335 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_Bounds3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
index 7a8360e61..dd8f0fea3 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
index 278d1d282..da6adb841 100644
--- a/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
@@ -2,10 +2,10 @@
     "DELEGATECALL_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/DUP_Bounds.json b/GeneralStateTests/stBoundsTest/DUP_Bounds.json
index 4c2eb213c..66fa1a568 100644
--- a/GeneralStateTests/stBoundsTest/DUP_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/DUP_Bounds.json
@@ -2,10 +2,10 @@
     "DUP_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
index 5cd7cda90..5b50ba328 100644
--- a/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
@@ -2,10 +2,10 @@
     "DUP_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json b/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
index f8b3fed4f..06c3238b1 100644
--- a/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
@@ -2,10 +2,10 @@
     "JUMPI_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json b/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
index 68dc54ef4..9d0576fe4 100644
--- a/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
@@ -2,10 +2,10 @@
     "JUMPI_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
index 9a15d18cb..52bd91959 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
@@ -2,10 +2,10 @@
     "JUMP_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
index 2e4b0a2f5..c6b56ac9a 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
@@ -2,10 +2,10 @@
     "JUMP_Bounds2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
index 686a7aa16..87695423b 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
@@ -2,10 +2,10 @@
     "JUMP_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
index 1a87aa9e7..3125538c4 100644
--- a/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
@@ -2,10 +2,10 @@
     "JUMP_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json
index 8a8ee584a..2fc8e354d 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
index 24d70fbaf..64ff7a7e0 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
index dd993a032..6878f2961 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds2OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
index 94bc985c8..dc7f02900 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
@@ -2,10 +2,10 @@
     "MLOAD_Bounds3OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json b/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
index c7ff19062..5989f5536 100644
--- a/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
@@ -2,10 +2,10 @@
     "MLOAD_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json b/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
index 9b5ac2ee4..1a18adefa 100644
--- a/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
@@ -2,10 +2,10 @@
     "MSTORE_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json b/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
index 4e9eeccef..6674ce620 100644
--- a/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
+++ b/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
@@ -2,10 +2,10 @@
     "MSTORE_Bounds2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
index ad2500402..9d025a01d 100644
--- a/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
@@ -2,10 +2,10 @@
     "MSTORE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/POP_Bounds.json b/GeneralStateTests/stBoundsTest/POP_Bounds.json
index c1ab79913..3c8dab4d5 100644
--- a/GeneralStateTests/stBoundsTest/POP_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/POP_Bounds.json
@@ -2,10 +2,10 @@
     "POP_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
index f9fd31512..eff247f57 100644
--- a/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
@@ -2,10 +2,10 @@
     "POP_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/RETURN_Bounds.json b/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
index 3f1c6618c..ab723a8a6 100644
--- a/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
@@ -2,10 +2,10 @@
     "RETURN_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json b/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
index 1e2fb4df1..0c6afc6de 100644
--- a/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
@@ -2,10 +2,10 @@
     "RETURN_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json b/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
index 477ad3a85..63179b366 100644
--- a/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
@@ -2,10 +2,10 @@
     "SLOAD_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json b/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
index 836234e4f..a0ce4f016 100644
--- a/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
@@ -2,10 +2,10 @@
     "SLOAD_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json b/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
index 6bc615a22..2b5eff350 100644
--- a/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
+++ b/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
@@ -2,10 +2,10 @@
     "SSTORE_Bounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
index 01d560547..a3e95e781 100644
--- a/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
+++ b/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
@@ -2,10 +2,10 @@
     "SSTORE_BoundsOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
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" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
index 4130d84d4..c8a531434 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
index fe2f2a605..3c69d3770 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024OOG.json
@@ -2,10 +2,10 @@
     "Call1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
index 39b88c590..1e832576c 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Call1024PreCalls.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
index 9b4c8f6bb..b057e84b8 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallLoseGasOOG.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
index 332765bd1..86c3c2742 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallRecursiveBombPreCall.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
index 1aec96b54..5b67a8bdd 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
index 0324327ed..8c839de1c 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
@@ -2,10 +2,10 @@
     "Callcode1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
index 9c86e8fe8..4288d7d09 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
index 1ec75eb57..44fca542f 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput1.json
@@ -2,10 +2,10 @@
     "callOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
index bfb4f0731..e6bf45eff 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput2.json
@@ -2,10 +2,10 @@
     "callOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
index 6053d359b..bfb95e077 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3.json
@@ -2,10 +2,10 @@
     "callOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
index 07ca26b38..5823c66f4 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3Fail.json
@@ -2,10 +2,10 @@
     "callOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
index a50954891..bd42717a3 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partial.json
@@ -2,10 +2,10 @@
     "callOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
index c55652467..137646e56 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callOutput3partialFail.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
index 3af44ae02..dc3aeee4c 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValue.json
@@ -2,10 +2,10 @@
     "callWithHighValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
index 39121ae08..4ea414173 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndGasOOG.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
index 47ba8054d..3385f6129 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevel.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndOOGatTxLevel" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
index ba4c4d92a..42ecbf1ad 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callWithHighValueOOGinCall.json
@@ -2,10 +2,10 @@
     "callWithHighValueOOGinCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
index e20ae804f..b3a302ad6 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput1.json
@@ -2,10 +2,10 @@
     "callcodeOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
index f684d4a9c..d1612f712 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2.json
@@ -2,10 +2,10 @@
     "callcodeOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
index 643bdbe04..cce61cf36 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3.json
@@ -2,10 +2,10 @@
     "callcodeOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
index ea7968e0b..fdf0d5dae 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3Fail.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
index 6af3006dd..9fdd2ec2f 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partial.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
index 997aae3b5..b9b253418 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3partialFail.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
index d1d59ceeb..cec8459f6 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValue.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
index b8184961a..3d7bf35d9 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOG.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
index 5ae5a9c79..2e5a608e0 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
@@ -2,10 +2,10 @@
     "createFailBalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
index e034d9ab7..ac888fd26 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination.json
@@ -2,10 +2,10 @@
     "createInitFailBadJumpDestination" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
index 638db1c3b..4f1dfc07f 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024.json
@@ -2,10 +2,10 @@
     "createInitFailStackSizeLargerThan1024" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
index 7024ee326..f825072d0 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailStackUnderflow.json
@@ -2,10 +2,10 @@
     "createInitFailStackUnderflow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
index ac21ba890..9b30ad968 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFailUndefinedInstruction.json
@@ -2,10 +2,10 @@
     "createInitFailUndefinedInstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
index 8d5c7b4ee..f105a57cd 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitFail_OOGduringInit.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
index 7a259756e..a7a0d2b64 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createInitOOGforCREATE.json
@@ -2,10 +2,10 @@
     "createInitOOGforCREATE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
index 8075d9a62..194dc0514 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
@@ -2,16 +2,16 @@
     "createJS_ExampleContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "40f6cbdb7ca65f2e117b8b4c1045e8fc56b2489aaba8782dc823287caa9e34b1",
+                    "hash" : "79cec0dcf78cfc0ce36fa009677ea0e155d1e0b455e5293392d44d03fbd37b30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "42dc529367effa117b038f636726a90ef68de693a4ed0606b5e9a630437d3be7",
+                    "hash" : "e2008905f4a23c83700e68796fcc26a6226605bab8ab75e382f3f4f133862667",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5463198ffbf761ce22d9421e3d19177248189f91cbde328ba906986c2684e3f7",
+                    "hash" : "a16625e1f3cb3713fcfa0d5160b6b09d3ce45c712f1a9650412e5aa54fe1998e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "40f6cbdb7ca65f2e117b8b4c1045e8fc56b2489aaba8782dc823287caa9e34b1",
+                    "hash" : "79cec0dcf78cfc0ce36fa009677ea0e155d1e0b455e5293392d44d03fbd37b30",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
index 50164f2da..110a56605 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_NoCollision.json
@@ -1,17 +1,17 @@
 {
-    "createJS_ExampleContract" : {
+    "createJS_NoCollision" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "46a17e04d9b1aa09223a578c35e6fb86af5cb8cf5b5c148f3359b4ae250f04e2",
+                    "hash" : "2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "28d2ee893a88e792323276b1c15f290e325f233d22e99fce2e9d7c114c34e4e4",
+                    "hash" : "8711293c80aa5a2ca90b9771b3ee453ec25a0c0799fa6aabcc09b427802880cc",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "abb7bafb3bad22e2218770dee2cbed9d09c5feff2fd1722bddd7e21c83a8135a",
+                    "hash" : "e0974185f0c4317e900da502eddb5d6e5c5accbb8b98f7cb9e223cb054423b60",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "46a17e04d9b1aa09223a578c35e6fb86af5cb8cf5b5c148f3359b4ae250f04e2",
+                    "hash" : "2dcdc769bddc469d0eea04acebb4f082cd16bb90642264763c1f2efb4636f674",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
index af2e2358c..f6ddfdcb4 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxs.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxs" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
index a7d497e18..cde91b304 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGas.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
index f355377c6..5de510dbc 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGas.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPreStore1NotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
index 39775e6f1..51c4592e7 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHigh.json
@@ -2,10 +2,10 @@
     "createNameRegistratorendowmentTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
index 60b5704c8..9d5b4143c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
index ff5e8f2ae..bd2851ea1 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
index cfc840d3a..61f71cb15 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
index ca075fa68..8533df282 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
index 4f9e12a01..b35e87861 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
index d8e8ce37a..527e68d31 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
index a0811cd46..a6b6f382c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
index 266fab77b..1daf5b5a7 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
index e879c8730..de6a83bcc 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
index 2537ecbd8..fc8e71bcb 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
index d42a58f96..d62a4aba1 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
index 6fcab6697..e2152c33c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
index db6a60c20..6ffac34b5 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
index 7b30cc351..2880cb46a 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
index 8952fd1ff..e80f229ae 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
index a0b6ca1df..6abedcab7 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
index de60ed043..f3b3fa2a1 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
index d3338315e..b024415ca 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
index cd6f96881..f1981fe05 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
index 6ceb24d6f..caf1339b6 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
index 1d7c32a81..8af88d949 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
index 1e89dbd1e..d1efeddc9 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
index ef0f83b53..203be8d28 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
index a64da575b..7e604ca1b 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
index 0d3b3e809..7fc2d39fc 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
index dc8210fc2..1a0f2df5f 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
index b34601fd7..6f24ea86d 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
index ec55dcfe8..730d54bc9 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
index 2cf925bc1..0d7a2ac58 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
index fc133b45a..ab1bfc419 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
index d975dc5d5..d6128718c 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
index 4715ed38d..1e4c62222 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
index c16bf0a8b..6260eeb71 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
index 687807759..4736306e4 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
index dba8a6ba2..9e430cf9e 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
index 57e74c898..6bc726b9d 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
index 10105ccad..279547ccb 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
index 3c2f39e8d..89e1bef78 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
index 912d2c26b..e196fe53d 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
index 930d028a2..40f81b41b 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
index 92d099cb5..1a032cc45 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
index 57547f315..de657c955 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
index 4c632228a..f4c69c583 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
index 7eb272596..ca2a2ce92 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
index 0159193ed..c2d43874d 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
index 6e331c89f..65b3194a2 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
index 01cbbe70a..8879ac574 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
index d5d647d92..cb7ec2083 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
index bafeafeb3..9c3931e16 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
index 9a76563c0..a476a7f78 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
index 76d744f2e..084b30433 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
index 80df964ae..1b6f8f538 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
index 72914b4f9..6dc64ec04 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
index eda9fc88f..150fe249e 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
index a2b536b0f..c8440d751 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
index b6aa27de2..78a566985 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
index d1fcf16d9..50d2ea569 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
index 60667ec19..3dc70c663 100644
--- a/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE.json
+++ b/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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" : {
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" : {
diff --git a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
index fbd5d6054..59b10c4f1 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
             "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
index 5917209a4..386f58d4b 100644
--- a/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
+++ b/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
index a07f0e0c5..c1c91ef34 100644
--- a/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
+++ b/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
index 94d52c43c..f78922c39 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
index b1f570f36..79fa716b3 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
index b8791afc4..eb420f777 100644
--- a/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
+++ b/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_valueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
index 2540a5067..69630e6da 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
index 3b040d4b1..aa4c356dc 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
index b29e517ac..d5eaef628 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
index f369ff597..8eb7d29e1 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
index 365e67786..0f795e5cb 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
index 66ed8d8db..3416e9f65 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
index 339a21c13..ab00da849 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
index fa60d5191..69cf11f81 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
index c58d002bf..aa0b84a1d 100644
--- a/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
index 54b6b05e9..951ed1c08 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
index 78384ce6e..025985e80 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
index 36f7eeade..6606ae6e2 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
index 75b9105c0..5cf772fab 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
index df7f24835..7c6c81a9c 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
index 4555b14f1..12ea3ec04 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
index d55d295d1..d3e30ba13 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
index 5d1439808..93353f8ed 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
index 6ee47c299..d5dd89e38 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
index 07589fca6..2e0c5813d 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
index dcffba74c..c0d39b5d0 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
index 55ed15a09..b9dfe63ca 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
index 4edd9588f..02f0ed60b 100644
--- a/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
+++ b/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
index ed09c6634..bfc66bbe7 100644
--- a/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
@@ -2,10 +2,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
index fd8930a52..5210cce30 100644
--- a/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
+++ b/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json b/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json
index 9aa5da66a..b0f15f293 100644
--- a/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json
+++ b/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize.json
@@ -2,10 +2,10 @@
     "codesizeOOGInvalidSize" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01312d00",
             "currentNumber" : "0x1388",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCodeSizeLimit/codesizeValid.json b/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
index 9b2aa20d6..d85a94b22 100644
--- a/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
+++ b/GeneralStateTests/stCodeSizeLimit/codesizeValid.json
@@ -2,10 +2,10 @@
     "codesizeValid" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x01312d00",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
index c66e9980b..952ae89d9 100644
--- a/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
+++ b/GeneralStateTests/stCreateTest/CREATE_AcreateB_BSuicide_BStore.json
@@ -2,10 +2,10 @@
     "CREATE_AcreateB_BSuicide_BStore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
index 83a89e479..5201660b4 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit.json
@@ -2,10 +2,10 @@
     "CREATE_ContractSuicideDuringInit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
index fcacc391f..ab637f6b0 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_ThenStoreThenReturn.json
@@ -2,10 +2,10 @@
     "CREATE_ContractSuicideDuringInit_ThenStoreThenReturn" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
index be087b272..8d47877d4 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValue.json
@@ -2,10 +2,10 @@
     "CREATE_ContractSuicideDuringInit_WithValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
index 1cef0e83e..efdae65d4 100644
--- a/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
+++ b/GeneralStateTests/stCreateTest/CREATE_ContractSuicideDuringInit_WithValueToItself.json
@@ -2,10 +2,10 @@
     "CREATE_ContractSuicideDuringInit_WithValueToItself" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
index 8e3e58812..664daa24a 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateEContractInInit_Tr.json
@@ -2,10 +2,10 @@
     "CREATE_EContractCreateEContractInInit_Tr" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
index 5bf1b7883..cfae25673 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInitOOG_Tr.json
@@ -2,10 +2,10 @@
     "CREATE_EContractCreateNEContractInInitOOG_Tr" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
index 4051dc949..b67ce38e5 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContractCreateNEContractInInit_Tr.json
@@ -2,10 +2,10 @@
     "CREATE_EContractCreateNEContractInInit_Tr" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
index 1f91ba6e1..75e07fb5f 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EContract_ThenCALLToNonExistentAcc.json
@@ -2,10 +2,10 @@
     "CREATE_EContract_ThenCALLToNonExistentAcc" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
index af0d21090..92aac6a43 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContract.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
index 8477c01e9..9d70f341b 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_0wei.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContractAndCallIt_0wei" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
index c4c83c729..da6ae6c77 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractAndCallIt_1wei.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContractAndCallIt_1wei" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
index 62d782045..65b6d0d9e 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithBalance.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContractWithBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
index d7151a0c2..34caff05f 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorage.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContractWithStorage" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
index 29b83f8f7..cb11151c6 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_0wei.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContractWithStorageAndCallIt_0wei" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
index 694dbbb0e..8bb7348ac 100644
--- a/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
+++ b/GeneralStateTests/stCreateTest/CREATE_EmptyContractWithStorageAndCallIt_1wei.json
@@ -2,10 +2,10 @@
     "CREATE_EmptyContractWithStorageAndCallIt_1wei" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
index 30e664619..0cca3f486 100644
--- a/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
+++ b/GeneralStateTests/stCreateTest/CREATE_empty000CreateinInitCode_Transaction.json
@@ -2,10 +2,10 @@
     "CREATE_empty000CreateinInitCode_Transaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
index e9485daa4..1d1cf5554 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
index 6fbb268dd..b1be09ab2 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG.json
@@ -2,10 +2,10 @@
     "Call1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json b/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
index b98c7702d..3a8b9628d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
index 709291a12..2d827f806 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json b/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
index 29cb0e6dd..cfa393c7b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
index 7c3db8a7e..493a63f44 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
index eb367f073..400b8cd1b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024.json
@@ -2,10 +2,10 @@
     "Delegatecall1024" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
index e36894c78..b9c375085 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG.json
@@ -2,10 +2,10 @@
     "Delegatecall1024OOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
index 5fca5eb1e..acc9a3b68 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput1.json
@@ -2,10 +2,10 @@
     "callOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
index 2beb2919b..0d322bfbb 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput2.json
@@ -2,10 +2,10 @@
     "callOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
index d9c96c488..8271a4e2e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3.json
@@ -2,10 +2,10 @@
     "callOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
index c9f8841a5..0fe7a8c39 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail.json
@@ -2,10 +2,10 @@
     "callOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
index 2daf984df..6bc8f5a99 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial.json
@@ -2,10 +2,10 @@
     "callOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
index dfe2787c7..8dc14c65a 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
index 94421493d..a433c025d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
index 985e32dfc..77c384e77 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1.json
@@ -2,10 +2,10 @@
     "callcodeOutput1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
index 29e547d92..9d0c0b0ab 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2.json
@@ -2,10 +2,10 @@
     "callcodeOutput2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
index 05f209bb2..dcc8f702b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3.json
@@ -2,10 +2,10 @@
     "callcodeOutput3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
index 1c507d10c..d14c1ae0b 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
index 1fcc3b1c5..38b33435d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
index b1e11b692..663d18095 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
index 57cb51fbe..abeae986d 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json b/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
index 254fda8ac..c2bb8bb62 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer.json
@@ -2,10 +2,10 @@
     "deleagateCallAfterValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
index 58dce29e6..0e895f573 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel.json
@@ -2,10 +2,10 @@
     "delegatecallAndOOGatTxLevel" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
index 877497131..3445f045e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic.json
@@ -2,10 +2,10 @@
     "delegatecallBasic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
index b42153a80..fae7056bb 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract.json
@@ -2,10 +2,10 @@
     "delegatecallEmptycontract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
index a6a2362da..3b50b1e6e 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
index c9f5800f4..f257e30e7 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
index 48ec4bb70..d7f5938e6 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContractOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
index 7044a33fc..e99bf93b5 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall.json
@@ -2,10 +2,10 @@
     "delegatecallOOGinCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
index 99b7416c0..d2f40b387 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck.json
@@ -2,10 +2,10 @@
     "delegatecallSenderCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
index 917668b67..8c735e676 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck.json
@@ -2,10 +2,10 @@
     "delegatecallValueCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
index 475c3a659..d45a64d70 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
index 673f56eaf..1b9435e18 100644
--- a/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
+++ b/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode2SelfCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
index 9fab7d9a2..1592e5cad 100644
--- a/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAndCallcodeConsumeMoreGasThenTransactionHas.json
@@ -2,10 +2,10 @@
     "CallAndCallcodeConsumeMoreGasThenTransactionHas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
index 9df2c335b..6d1009cd8 100644
--- a/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/CallAskMoreGasOnDepth2ThenTransactionHas.json
@@ -2,10 +2,10 @@
     "CallAskMoreGasOnDepth2ThenTransactionHas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
index aead3862a..ead1b0b09 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel.json
@@ -2,10 +2,10 @@
     "CallGoesOOGOnSecondLevel" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
index c4d5d9c0f..f3a2fa569 100644
--- a/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
+++ b/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2.json
@@ -2,10 +2,10 @@
     "CallGoesOOGOnSecondLevel2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
index 7eac4868b..cf098d8f8 100644
--- a/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
+++ b/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate.json
@@ -2,10 +2,10 @@
     "CreateAndGasInsideCreate" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
index 37fb97da0..7ae64a764 100644
--- a/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
+++ b/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP.json
@@ -2,10 +2,10 @@
     "DelegateCallOnEIP" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
index d4ac055ab..4d66ff027 100644
--- a/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
+++ b/GeneralStateTests/stEIP150Specific/ExecuteCallThatAskForeGasThenTrabsactionHas.json
@@ -2,10 +2,10 @@
     "ExecuteCallThatAskForeGasThenTrabsactionHas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
index 254ebb07e..82d9ef49e 100644
--- a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
+++ b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json
@@ -2,10 +2,10 @@
     "NewGasPriceForCodes" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
index ccf9ff907..c38286c6e 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToExistingContract.json
@@ -2,10 +2,10 @@
     "SuicideToExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
index ea6904aac..6bff780b4 100644
--- a/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
+++ b/GeneralStateTests/stEIP150Specific/SuicideToNotExistingContract.json
@@ -2,10 +2,10 @@
     "SuicideToNotExistingContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
index f96c8de3c..fc7b6f8fb 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64e0.json
@@ -2,10 +2,10 @@
     "Transaction64Rule_d64e0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
index 5b0aeca36..521615596 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64m1.json
@@ -2,10 +2,10 @@
     "Transaction64Rule_d64m1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
index 830d18e27..2d31a8977 100644
--- a/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
+++ b/GeneralStateTests/stEIP150Specific/Transaction64Rule_d64p1.json
@@ -2,10 +2,10 @@
     "Transaction64Rule_d64p1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
index be8c0c5f0..569fd380b 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawBalanceGas.json
@@ -2,10 +2,10 @@
     "RawBalanceGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
index da9f04b80..6fdbd135b 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGas.json
@@ -2,10 +2,10 @@
     "RawCallCodeGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
index a388263b0..9dbc7490b 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasAsk.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
index 97ed7d3d7..048029875 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemory.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasMemory" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
index 40b0588a9..0d41b8545 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasMemoryAsk.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasMemoryAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
index c918b5592..bb1294809 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransfer.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
index 2f337a421..2a7c510c9 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferAsk.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasValueTransferAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
index 4906de4b1..f19939c34 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemory.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasValueTransferMemory" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
index 919ce89d9..84c5e541a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallCodeGasValueTransferMemoryAsk.json
@@ -2,10 +2,10 @@
     "RawCallCodeGasValueTransferMemoryAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
index 3931f12f8..4a089ffcc 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGas.json
@@ -2,10 +2,10 @@
     "RawCallGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
index 2b1ec0380..64fcdcf3d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasAsk.json
@@ -2,10 +2,10 @@
     "RawCallGasAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
index 1bf5dd399..b663595d7 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransfer.json
@@ -2,10 +2,10 @@
     "RawCallGasValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
index 7460df44f..ee915c03c 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferAsk.json
@@ -2,10 +2,10 @@
     "RawCallGasValueTransferAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
index a1e5c38c3..9ff690fd8 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemory.json
@@ -2,10 +2,10 @@
     "RawCallGasValueTransferMemory" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
index 116693ffc..7db499df8 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallGasValueTransferMemoryAsk.json
@@ -2,10 +2,10 @@
     "RawCallGasValueTransferMemoryAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
index 6ed59e38b..abd0ac5ca 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGas.json
@@ -2,10 +2,10 @@
     "RawCallMemoryGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
index 4a58cd14a..5c0c8cf6a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCallMemoryGasAsk.json
@@ -2,10 +2,10 @@
     "RawCallMemoryGasAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
index 5cc5bec9b..42ea4385d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer.json
@@ -2,10 +2,10 @@
     "RawCreateFailGasValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
index 507318fa8..1b52cc140 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateFailGasValueTransfer2.json
@@ -2,10 +2,10 @@
     "RawCreateFailGasValueTransfer2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
index c5c12e6f3..8949b7f70 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas.json
@@ -2,10 +2,10 @@
     "RawCreateGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
index 67aa3d82c..5cf809dca 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasMemory.json
@@ -2,10 +2,10 @@
     "RawCreateGasMemory" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
index 99723ced4..779cba4c0 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransfer.json
@@ -2,10 +2,10 @@
     "RawCreateGasValueTransfer" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
index 4809cee76..e84c81b7a 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGasValueTransferMemory.json
@@ -2,10 +2,10 @@
     "RawCreateGasValueTransferMemory" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
index e1ec45849..bf78181fb 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGas.json
@@ -2,10 +2,10 @@
     "RawDelegateCallGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
index e05e2d7fa..069fc7a2d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasAsk.json
@@ -2,10 +2,10 @@
     "RawDelegateCallGasAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
index 36151f3e0..19a0c75de 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemory.json
@@ -2,10 +2,10 @@
     "RawDelegateCallGasMemory" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
index 4e65682b1..67e1ace1d 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawDelegateCallGasMemoryAsk.json
@@ -2,10 +2,10 @@
     "RawDelegateCallGasMemoryAsk" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
index 5f9045ef4..98c6c9065 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyGas.json
@@ -2,10 +2,10 @@
     "RawExtCodeCopyGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
index 4eab800fa..ff255d8d4 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeCopyMemoryGas.json
@@ -2,10 +2,10 @@
     "RawExtCodeCopyMemoryGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
index 573528d39..8ad35829b 100644
--- a/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
+++ b/GeneralStateTests/stEIP150singleCodeGasPrices/RawExtCodeSizeGas.json
@@ -2,10 +2,10 @@
     "RawExtCodeSizeGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json b/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json
index d451d1e43..08faecc74 100644
--- a/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json
+++ b/GeneralStateTests/stEIP158Specific/CALL_OneVCallSuicide.json
@@ -2,10 +2,10 @@
     "CALL_OneVCallSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json b/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json
index c5873887d..eeff3c3f4 100644
--- a/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json
+++ b/GeneralStateTests/stEIP158Specific/CALL_ZeroVCallSuicide.json
@@ -2,10 +2,10 @@
     "CALL_ZeroVCallSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP158Specific/EXP_Empty.json b/GeneralStateTests/stEIP158Specific/EXP_Empty.json
index 1b7d7a106..2ec571a77 100644
--- a/GeneralStateTests/stEIP158Specific/EXP_Empty.json
+++ b/GeneralStateTests/stEIP158Specific/EXP_Empty.json
@@ -2,10 +2,10 @@
     "EXP_Empty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json
index d0bfddfe7..06e30dfc5 100644
--- a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json
+++ b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toEpmty.json
@@ -2,10 +2,10 @@
     "EXTCODESIZE_toEpmty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json
index ce156574c..5656c34f9 100644
--- a/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json
+++ b/GeneralStateTests/stEIP158Specific/EXTCODESIZE_toNonExistent.json
@@ -2,10 +2,10 @@
     "EXTCODESIZE_toNonExistent" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
index 6ce55933f..1b30ea9f9 100644
--- a/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
+++ b/GeneralStateTests/stEIP158Specific/vitalikTransactionTest.json
@@ -2,10 +2,10 @@
     "vitalikTransactionTest" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stExample/add11.json b/GeneralStateTests/stExample/add11.json
index 0e4ab1b9d..04335116c 100644
--- a/GeneralStateTests/stExample/add11.json
+++ b/GeneralStateTests/stExample/add11.json
@@ -2,10 +2,10 @@
     "add11" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json
index 54a02822f..709e56426 100644
--- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json
+++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContract.json
@@ -2,10 +2,10 @@
     "contractCreationOOGdontLeaveEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
index 93268f1d2..e6ee1e247 100644
--- a/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
+++ b/GeneralStateTests/stHomesteadSpecific/contractCreationOOGdontLeaveEmptyContractViaTransaction.json
@@ -2,10 +2,10 @@
     "contractCreationOOGdontLeaveEmptyContractViaTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json b/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json
index 405b69f3b..e80f5af44 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaContract.json
@@ -2,10 +2,10 @@
     "createContractViaContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json b/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json
index 029a72196..60a478ccd 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaContractOOGInitCode.json
@@ -2,10 +2,10 @@
     "createContractViaContractOOGInitCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
index cc4abe2e4..3c18226e2 100644
--- a/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
+++ b/GeneralStateTests/stHomesteadSpecific/createContractViaTransactionCost53000.json
@@ -2,10 +2,10 @@
     "createContractViaTransactionCost53000" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
index b4f10b4c9..2be57258b 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractAndCallItOOG.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractAndCallItOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
index 4ecb17ae9..2750ee27a 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractNoCash.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractNoCash" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
index f59c2065b..a6858b3ab 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOG.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
index f3dd2161f..7ee3abf41 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractOOGBonusGas.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractOOGBonusGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
index 8415ce928..da99f2d1f 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractIfCalled.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractWhichWouldCreateContractIfCalled" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
index 968b7f023..d2bddd1ab 100644
--- a/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
+++ b/GeneralStateTests/stInitCodeTest/CallContractToCreateContractWhichWouldCreateContractInInitCode.json
@@ -2,10 +2,10 @@
     "CallContractToCreateContractWhichWouldCreateContractInInitCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
index 857682389..bf5433a4c 100644
--- a/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
+++ b/GeneralStateTests/stInitCodeTest/CallRecursiveContract.json
@@ -2,10 +2,10 @@
     "CallRecursiveContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
index c3ba31b0c..3db132ba8 100644
--- a/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
+++ b/GeneralStateTests/stInitCodeTest/CallTheContractToCreateEmptyContract.json
@@ -2,10 +2,10 @@
     "CallTheContractToCreateEmptyContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
index 152337e86..61c1706de 100644
--- a/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/NotEnoughCashContractCreation.json
@@ -2,10 +2,10 @@
     "NotEnoughCashContractCreation" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
index 286daec00..4b8fb92fb 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasContractCreation.json
@@ -2,10 +2,10 @@
     "OutOfGasContractCreation" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
index 8cf21f28d..7470cc718 100644
--- a/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation.json
@@ -2,10 +2,10 @@
     "OutOfGasPrefundedContractCreation" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest.json b/GeneralStateTests/stInitCodeTest/ReturnTest.json
index c4ff03fbc..f2b6852c5 100644
--- a/GeneralStateTests/stInitCodeTest/ReturnTest.json
+++ b/GeneralStateTests/stInitCodeTest/ReturnTest.json
@@ -2,10 +2,10 @@
     "ReturnTest" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/ReturnTest2.json b/GeneralStateTests/stInitCodeTest/ReturnTest2.json
index 561317b3a..20fd223fd 100644
--- a/GeneralStateTests/stInitCodeTest/ReturnTest2.json
+++ b/GeneralStateTests/stInitCodeTest/ReturnTest2.json
@@ -2,10 +2,10 @@
     "ReturnTest2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x3b9aca00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
index dbb5f4fb7..75f85c674 100644
--- a/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
+++ b/GeneralStateTests/stInitCodeTest/StackUnderFlowContractCreation.json
@@ -2,10 +2,10 @@
     "StackUnderFlowContractCreation" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
index 9effdd358..87ddeb487 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateAutoSuicideContract.json
@@ -2,10 +2,10 @@
     "TransactionCreateAutoSuicideContract" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
index 6fa45d6f2..971294f8b 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateRandomInitCode.json
@@ -2,10 +2,10 @@
     "TransactionCreateRandomInitCode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
index 354d4e2d3..26b4a900e 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateStopInInitcode.json
@@ -2,10 +2,10 @@
     "TransactionCreateStopInInitcode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
index 12f79dd0f..acc56c7a0 100644
--- a/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
+++ b/GeneralStateTests/stInitCodeTest/TransactionCreateSuicideInInitcode.json
@@ -2,10 +2,10 @@
     "TransactionCreateSuicideInInitcode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_emptyMem.json b/GeneralStateTests/stLogTests/log0_emptyMem.json
index 6910aa2ab..269cb9ade 100644
--- a/GeneralStateTests/stLogTests/log0_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log0_emptyMem.json
@@ -2,10 +2,10 @@
     "log0_emptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
index 9e9674060..16cb67082 100644
--- a/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log0_logMemStartTooHigh.json
@@ -2,10 +2,10 @@
     "log0_logMemStartTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
index c41b345ec..0870feb4f 100644
--- a/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log0_logMemsizeTooHigh.json
@@ -2,10 +2,10 @@
     "log0_logMemsizeTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_logMemsizeZero.json b/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
index 732cf5f0b..36157d1a2 100644
--- a/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log0_logMemsizeZero.json
@@ -2,10 +2,10 @@
     "log0_logMemsizeZero" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
index 77a9936e9..9faa91821 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem.json
@@ -2,10 +2,10 @@
     "log0_nonEmptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
index 7cfc55343..875fcf6f5 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1.json
@@ -2,10 +2,10 @@
     "log0_nonEmptyMem_logMemSize1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
index f20fa1cbe..9c1cfe57c 100644
--- a/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log0_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,10 +2,10 @@
     "log0_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_Caller.json b/GeneralStateTests/stLogTests/log1_Caller.json
index 8bc82ae61..1e53622ba 100644
--- a/GeneralStateTests/stLogTests/log1_Caller.json
+++ b/GeneralStateTests/stLogTests/log1_Caller.json
@@ -2,10 +2,10 @@
     "log1_Caller" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_MaxTopic.json b/GeneralStateTests/stLogTests/log1_MaxTopic.json
index 3cb233ff7..9fd21bd31 100644
--- a/GeneralStateTests/stLogTests/log1_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log1_MaxTopic.json
@@ -2,10 +2,10 @@
     "log1_MaxTopic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_emptyMem.json b/GeneralStateTests/stLogTests/log1_emptyMem.json
index 6688bc121..a80523433 100644
--- a/GeneralStateTests/stLogTests/log1_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log1_emptyMem.json
@@ -2,10 +2,10 @@
     "log1_emptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
index b86715299..5b44f5a70 100644
--- a/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log1_logMemStartTooHigh.json
@@ -2,10 +2,10 @@
     "log1_logMemStartTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
index 0b527e983..d5a47521b 100644
--- a/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log1_logMemsizeTooHigh.json
@@ -2,10 +2,10 @@
     "log1_logMemsizeTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_logMemsizeZero.json b/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
index 6a5a32f01..353542c5d 100644
--- a/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log1_logMemsizeZero.json
@@ -2,10 +2,10 @@
     "log1_logMemsizeZero" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
index 29093e6b5..9d0381304 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem.json
@@ -2,10 +2,10 @@
     "log1_nonEmptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
index a701afecd..8c3127651 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1.json
@@ -2,10 +2,10 @@
     "log1_nonEmptyMem_logMemSize1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
index 54ce85a90..b27661902 100644
--- a/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log1_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,10 +2,10 @@
     "log1_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_Caller.json b/GeneralStateTests/stLogTests/log2_Caller.json
index 9b73dc4a3..bc8b44ef7 100644
--- a/GeneralStateTests/stLogTests/log2_Caller.json
+++ b/GeneralStateTests/stLogTests/log2_Caller.json
@@ -2,10 +2,10 @@
     "log2_Caller" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_MaxTopic.json b/GeneralStateTests/stLogTests/log2_MaxTopic.json
index 81ce4bc90..d8a116bae 100644
--- a/GeneralStateTests/stLogTests/log2_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log2_MaxTopic.json
@@ -2,10 +2,10 @@
     "log2_MaxTopic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_emptyMem.json b/GeneralStateTests/stLogTests/log2_emptyMem.json
index a890029cf..777c78c1d 100644
--- a/GeneralStateTests/stLogTests/log2_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log2_emptyMem.json
@@ -2,10 +2,10 @@
     "log2_emptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
index e82c0f253..9a766a506 100644
--- a/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log2_logMemStartTooHigh.json
@@ -2,10 +2,10 @@
     "log2_logMemStartTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
index 2c92afcfb..48bf80cce 100644
--- a/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log2_logMemsizeTooHigh.json
@@ -2,10 +2,10 @@
     "log2_logMemsizeTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_logMemsizeZero.json b/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
index 629a337db..22135503d 100644
--- a/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log2_logMemsizeZero.json
@@ -2,10 +2,10 @@
     "log2_logMemsizeZero" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
index b600e3a4e..8cefe1235 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem.json
@@ -2,10 +2,10 @@
     "log2_nonEmptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
index 132a42b9c..5abae7a41 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1.json
@@ -2,10 +2,10 @@
     "log2_nonEmptyMem_logMemSize1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
index d7ef1a5d2..ef18033a3 100644
--- a/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log2_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,10 +2,10 @@
     "log2_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_Caller.json b/GeneralStateTests/stLogTests/log3_Caller.json
index c7555e984..349f52d57 100644
--- a/GeneralStateTests/stLogTests/log3_Caller.json
+++ b/GeneralStateTests/stLogTests/log3_Caller.json
@@ -2,10 +2,10 @@
     "log3_Caller" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_MaxTopic.json b/GeneralStateTests/stLogTests/log3_MaxTopic.json
index e48884095..2a5dbbb0d 100644
--- a/GeneralStateTests/stLogTests/log3_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log3_MaxTopic.json
@@ -2,10 +2,10 @@
     "log3_MaxTopic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_PC.json b/GeneralStateTests/stLogTests/log3_PC.json
index 3a4d06c6f..a08ea8666 100644
--- a/GeneralStateTests/stLogTests/log3_PC.json
+++ b/GeneralStateTests/stLogTests/log3_PC.json
@@ -2,10 +2,10 @@
     "log3_PC" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_emptyMem.json b/GeneralStateTests/stLogTests/log3_emptyMem.json
index 0a7307a30..1c1639026 100644
--- a/GeneralStateTests/stLogTests/log3_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log3_emptyMem.json
@@ -2,10 +2,10 @@
     "log3_emptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
index dcadad2a3..bbf03f3a0 100644
--- a/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log3_logMemStartTooHigh.json
@@ -2,10 +2,10 @@
     "log3_logMemStartTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
index 0b1e9eeed..61716d3ca 100644
--- a/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log3_logMemsizeTooHigh.json
@@ -2,10 +2,10 @@
     "log3_logMemsizeTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_logMemsizeZero.json b/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
index ed7050707..3df87f43f 100644
--- a/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log3_logMemsizeZero.json
@@ -2,10 +2,10 @@
     "log3_logMemsizeZero" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
index 251be8df8..2224544d4 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem.json
@@ -2,10 +2,10 @@
     "log3_nonEmptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
index f1a25d36f..b3bb86610 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1.json
@@ -2,10 +2,10 @@
     "log3_nonEmptyMem_logMemSize1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
index 1ebc64690..0a40da414 100644
--- a/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log3_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,10 +2,10 @@
     "log3_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_Caller.json b/GeneralStateTests/stLogTests/log4_Caller.json
index e8d5b6cab..b2071edc8 100644
--- a/GeneralStateTests/stLogTests/log4_Caller.json
+++ b/GeneralStateTests/stLogTests/log4_Caller.json
@@ -2,10 +2,10 @@
     "log4_Caller" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_MaxTopic.json b/GeneralStateTests/stLogTests/log4_MaxTopic.json
index a9e6c062a..ca73f763f 100644
--- a/GeneralStateTests/stLogTests/log4_MaxTopic.json
+++ b/GeneralStateTests/stLogTests/log4_MaxTopic.json
@@ -2,10 +2,10 @@
     "log4_MaxTopic" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_PC.json b/GeneralStateTests/stLogTests/log4_PC.json
index 27b2e435e..5234431b1 100644
--- a/GeneralStateTests/stLogTests/log4_PC.json
+++ b/GeneralStateTests/stLogTests/log4_PC.json
@@ -2,10 +2,10 @@
     "log4_PC" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_emptyMem.json b/GeneralStateTests/stLogTests/log4_emptyMem.json
index 24893e2ab..8bdc632e8 100644
--- a/GeneralStateTests/stLogTests/log4_emptyMem.json
+++ b/GeneralStateTests/stLogTests/log4_emptyMem.json
@@ -2,10 +2,10 @@
     "log4_emptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json b/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
index 8d2b39a88..fccb945b5 100644
--- a/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
+++ b/GeneralStateTests/stLogTests/log4_logMemStartTooHigh.json
@@ -2,10 +2,10 @@
     "log4_logMemStartTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json b/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
index e6753d485..410e9f0dd 100644
--- a/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
+++ b/GeneralStateTests/stLogTests/log4_logMemsizeTooHigh.json
@@ -2,10 +2,10 @@
     "log4_logMemsizeTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_logMemsizeZero.json b/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
index 0ca8a286c..a6dd1ebad 100644
--- a/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
+++ b/GeneralStateTests/stLogTests/log4_logMemsizeZero.json
@@ -2,10 +2,10 @@
     "log4_logMemsizeZero" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
index 11d2df565..0ab9114e3 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem.json
@@ -2,10 +2,10 @@
     "log4_nonEmptyMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
index b696bc468..aa47c1696 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1.json
@@ -2,10 +2,10 @@
     "log4_nonEmptyMem_logMemSize1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
index 32d1fbf6b..675f339f1 100644
--- a/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
+++ b/GeneralStateTests/stLogTests/log4_nonEmptyMem_logMemSize1_logMemStart31.json
@@ -2,10 +2,10 @@
     "log4_nonEmptyMem_logMemSize1_logMemStart31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stLogTests/logInOOG_Call.json b/GeneralStateTests/stLogTests/logInOOG_Call.json
index 2f7456ded..35d5b0d5c 100644
--- a/GeneralStateTests/stLogTests/logInOOG_Call.json
+++ b/GeneralStateTests/stLogTests/logInOOG_Call.json
@@ -2,10 +2,10 @@
     "logInOOG_Call" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json
index 73e5d3f0b..bc3b12612 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "CallAndCallcodeConsumeMoreGasThenTransactionHasWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json
index 56bdd8d85..ad42c5b1b 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "CallAskMoreGasOnDepth2ThenTransactionHasWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json
index ff9595e97..4da0118b1 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevel2WithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "CallGoesOOGOnSecondLevel2WithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json
index 1e45ac269..b0db14951 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CallGoesOOGOnSecondLevelWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "CallGoesOOGOnSecondLevelWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json
index 43c708b26..12aeeb1da 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/CreateAndGasInsideCreateWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "CreateAndGasInsideCreateWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json
index a6cc1fad4..d1fc1b8be 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/DelegateCallOnEIPWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "DelegateCallOnEIPWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json
index 829229e9c..ad6fbaa5d 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "ExecuteCallThatAskMoreGasThenTransactionHasWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json b/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
index 33a2418b8..554fe874c 100644
--- a/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
+++ b/GeneralStateTests/stMemExpandingEIP150Calls/NewGasPriceForCodesWithMemExpandingCalls.json
@@ -2,10 +2,10 @@
     "NewGasPriceForCodesWithMemExpandingCalls" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
index 1613469ce..8a1cde547 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu.json
@@ -2,10 +2,10 @@
     "calldatacopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
index 90515602d..9baa6979e 100644
--- a/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/calldatacopy_dejavu2.json
@@ -2,10 +2,10 @@
     "calldatacopy_dejavu2 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
index 2b3f70ecf..7916561f5 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu.json
@@ -2,10 +2,10 @@
     "codecopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
index 7fedc0783..2f7f9ba42 100644
--- a/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
+++ b/GeneralStateTests/stMemoryTest/codecopy_dejavu2.json
@@ -2,10 +2,10 @@
     "codecopy_dejavu2 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
index 6facfdfdd..3f5fa4bc5 100644
--- a/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/extcodecopy_dejavu.json
@@ -2,10 +2,10 @@
     "extcodecopy_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log1_dejavu.json b/GeneralStateTests/stMemoryTest/log1_dejavu.json
index 532f37690..6f8276db9 100644
--- a/GeneralStateTests/stMemoryTest/log1_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log1_dejavu.json
@@ -2,10 +2,10 @@
     "log1_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log2_dejavu.json b/GeneralStateTests/stMemoryTest/log2_dejavu.json
index 49dedc086..3f7ec926a 100644
--- a/GeneralStateTests/stMemoryTest/log2_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log2_dejavu.json
@@ -2,10 +2,10 @@
     "log2_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log3_dejavu.json b/GeneralStateTests/stMemoryTest/log3_dejavu.json
index 9753d6629..fc724e607 100644
--- a/GeneralStateTests/stMemoryTest/log3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log3_dejavu.json
@@ -2,10 +2,10 @@
     "log3_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/log4_dejavu.json b/GeneralStateTests/stMemoryTest/log4_dejavu.json
index 9a6194ba6..2798aac14 100644
--- a/GeneralStateTests/stMemoryTest/log4_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/log4_dejavu.json
@@ -2,10 +2,10 @@
     "log4_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
index e71eadd61..ffb90ff74 100644
--- a/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem0b_singleByte.json
@@ -2,10 +2,10 @@
     "mem0b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
index 52b4821a9..9659f7ddb 100644
--- a/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem31b_singleByte.json
@@ -2,10 +2,10 @@
     "mem31b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
index e07f062aa..eacd3e459 100644
--- a/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32b_singleByte.json
@@ -2,10 +2,10 @@
     "mem32b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+1.json b/GeneralStateTests/stMemoryTest/mem32kb+1.json
index 9880a34a3..bc0d656b0 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+1.json
@@ -2,10 +2,10 @@
     "mem32kb+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+31.json b/GeneralStateTests/stMemoryTest/mem32kb+31.json
index ef0c1f9a2..2f264ef92 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+31.json
@@ -2,10 +2,10 @@
     "mem32kb+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+32.json b/GeneralStateTests/stMemoryTest/mem32kb+32.json
index f63a46b2b..a5df35f6f 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+32.json
@@ -2,10 +2,10 @@
     "mem32kb+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb+33.json b/GeneralStateTests/stMemoryTest/mem32kb+33.json
index 0ba3c4175..8e524a44a 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb+33.json
@@ -2,10 +2,10 @@
     "mem32kb+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-1.json b/GeneralStateTests/stMemoryTest/mem32kb-1.json
index 7ed6be171..659ee3759 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-1.json
@@ -2,10 +2,10 @@
     "mem32kb-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-31.json b/GeneralStateTests/stMemoryTest/mem32kb-31.json
index 730ce6832..8bd8ed559 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-31.json
@@ -2,10 +2,10 @@
     "mem32kb-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-32.json b/GeneralStateTests/stMemoryTest/mem32kb-32.json
index 48d88fddd..8689699e7 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-32.json
@@ -2,10 +2,10 @@
     "mem32kb-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb-33.json b/GeneralStateTests/stMemoryTest/mem32kb-33.json
index 4482ce6ce..2f2230bfd 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb-33.json
@@ -2,10 +2,10 @@
     "mem32kb-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb.json b/GeneralStateTests/stMemoryTest/mem32kb.json
index 23e43f599..f7c3d212f 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb.json
@@ -2,10 +2,10 @@
     "mem32kb " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
index 0ed8f4f5b..dae21a4c5 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+1.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
index 868725bfe..4a0bcccb2 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+31.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
index 6cfac0fa8..090f0dd74 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+32.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
index 327178251..ee2cdc513 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte+33.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
index f2c2a41d5..311955572 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-1.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
index 985f76703..163162a3c 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-31.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
index 89654a4a1..d7eaeab7c 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-32.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
index 4ed02e845..2a156b098 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte-33.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
index 82ce619c7..f8e99e953 100644
--- a/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem32kb_singleByte.json
@@ -2,10 +2,10 @@
     "mem32kb_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
index 2a2c3ea82..a572f4693 100644
--- a/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem33b_singleByte.json
@@ -2,10 +2,10 @@
     "mem33b_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+1.json b/GeneralStateTests/stMemoryTest/mem64kb+1.json
index 0bec3862d..c247dd7cc 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+1.json
@@ -2,10 +2,10 @@
     "mem64kb+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+31.json b/GeneralStateTests/stMemoryTest/mem64kb+31.json
index 68a619eae..6d1052b48 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+31.json
@@ -2,10 +2,10 @@
     "mem64kb+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+32.json b/GeneralStateTests/stMemoryTest/mem64kb+32.json
index 8246e504e..386de79eb 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+32.json
@@ -2,10 +2,10 @@
     "mem64kb+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb+33.json b/GeneralStateTests/stMemoryTest/mem64kb+33.json
index dcf73418f..f701899c3 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb+33.json
@@ -2,10 +2,10 @@
     "mem64kb+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-1.json b/GeneralStateTests/stMemoryTest/mem64kb-1.json
index 11d4f3fde..7f41b0939 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-1.json
@@ -2,10 +2,10 @@
     "mem64kb-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-31.json b/GeneralStateTests/stMemoryTest/mem64kb-31.json
index 36e4fc5fd..97634c774 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-31.json
@@ -2,10 +2,10 @@
     "mem64kb-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-32.json b/GeneralStateTests/stMemoryTest/mem64kb-32.json
index 46ec435b5..a084b9213 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-32.json
@@ -2,10 +2,10 @@
     "mem64kb-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb-33.json b/GeneralStateTests/stMemoryTest/mem64kb-33.json
index 2e8853c7c..e0afc6d83 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb-33.json
@@ -2,10 +2,10 @@
     "mem64kb-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb.json b/GeneralStateTests/stMemoryTest/mem64kb.json
index 43d2cb75c..0c51f7bbe 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb.json
@@ -2,10 +2,10 @@
     "mem64kb " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
index cebb3a9f9..5fbbfb3dc 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+1.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
index cb78fb298..4337dbde5 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+31.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
index 26a8663eb..2fb8f977e 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+32.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
index 3ec53dd11..5029caacb 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte+33.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte+33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
index 4dd3482a9..73d62f34c 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-1.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-1 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
index 17c69caa3..586074dc9 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-31.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-31 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
index 55c8a7f60..4d6750987 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-32.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-32 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
index 1549db222..2eb749246 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte-33.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte-33 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
index 4e25eaadc..cebc30a75 100644
--- a/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
+++ b/GeneralStateTests/stMemoryTest/mem64kb_singleByte.json
@@ -2,10 +2,10 @@
     "mem64kb_singleByte " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/memReturn.json b/GeneralStateTests/stMemoryTest/memReturn.json
index c61fef62e..5ff2951ed 100644
--- a/GeneralStateTests/stMemoryTest/memReturn.json
+++ b/GeneralStateTests/stMemoryTest/memReturn.json
@@ -2,10 +2,10 @@
     "memReturn " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mload16bitBound.json b/GeneralStateTests/stMemoryTest/mload16bitBound.json
index d7170e33b..056ac5314 100644
--- a/GeneralStateTests/stMemoryTest/mload16bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload16bitBound.json
@@ -2,10 +2,10 @@
     "mload16bitBound " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x10000804025c",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mload8bitBound.json b/GeneralStateTests/stMemoryTest/mload8bitBound.json
index 03335491c..0589f027d 100644
--- a/GeneralStateTests/stMemoryTest/mload8bitBound.json
+++ b/GeneralStateTests/stMemoryTest/mload8bitBound.json
@@ -2,10 +2,10 @@
     "mload8bitBound " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mload_dejavu.json b/GeneralStateTests/stMemoryTest/mload_dejavu.json
index efc77d3d1..a986e4210 100644
--- a/GeneralStateTests/stMemoryTest/mload_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mload_dejavu.json
@@ -2,10 +2,10 @@
     "mload_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mstore_dejavu.json b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
index e31e8609b..2ee722a70 100644
--- a/GeneralStateTests/stMemoryTest/mstore_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstore_dejavu.json
@@ -2,10 +2,10 @@
     "mstore_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
index 93fb9052a..7db116336 100644
--- a/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/mstroe8_dejavu.json
@@ -2,10 +2,10 @@
     "mstroe8_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/sha3_dejavu.json b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
index f5ef8718e..644d6a9aa 100644
--- a/GeneralStateTests/stMemoryTest/sha3_dejavu.json
+++ b/GeneralStateTests/stMemoryTest/sha3_dejavu.json
@@ -2,10 +2,10 @@
     "sha3_dejavu " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
index ea2be8891..87eef5fe9 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1023.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
index 01f5da6d2..cf8941078 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1024.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
index e5ab6d801..2e1450e8a 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitGas_1025.json
@@ -2,10 +2,10 @@
     "stackLimitGas_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
index 4174c3a68..ce06581de 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1023.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
index bb7386919..fdcafa6fd 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1024.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
index 5d85ad291..3f044b3dd 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush31_1025.json
@@ -2,10 +2,10 @@
     "stackLimitPush31_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
index b1c514452..6cf8cb7ab 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1023.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1023 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
index 891ae7f5b..fe0b7cb19 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1024.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1024 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
index 16cf97dfe..7b8796c20 100644
--- a/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
+++ b/GeneralStateTests/stMemoryTest/stackLimitPush32_1025.json
@@ -2,10 +2,10 @@
     "stackLimitPush32_1025 " : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0a00000000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json
index 220eda0ea..979a8d6c2 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL.json
@@ -2,10 +2,10 @@
     "CALL_OneVCallSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
index 3d7668c97..ce18bc78e 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
index 6234254a0..c8f786724 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
index 293b59a88..a8ae0bec4 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToNonNonZeroBalance.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
index ebd264324..0a088baa0 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALLCODE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
index 00e0f9bb3..727e23b3a 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToEmpty.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
index f6fca36d9..7b6537d02 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToNonNonZeroBalance.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALL_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
index 9c1379eb0..c6716bf5a 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALL_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "NonZeroValue_CALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
index e9850ca85..9f8874bfa 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
index 89e72fa38..3db0d3e27 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToEmpty.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
index d2db2a886..6db5e86e4 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
index e9250fe65..9dbcc059e 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_DELEGATECALL_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "NonZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
index 9fdc14ffd..aabcc90df 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
index dbf2ed1a1..5c1b1fb5c 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmpty.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
index 65407796e..53d73df04 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
index 05f9262a1..8c9cecb95 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "NonZeroValue_SUICIDE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
index 3d7676030..448d45991 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
index 1605d99ee..67b02e9e4 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToEmpty.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
index 458674534..f93aea8c2 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToNonNonZeroBalance.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
index d220aea87..f61618b1d 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALL_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
index 8cff27c94..f136ad822 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
index efb915a62..e28d313cc 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToEmpty.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
index 51e2d9feb..47241d25d 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
index ade806863..9e586bdf9 100644
--- a/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
+++ b/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_TransactionCALLwithData_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "NonZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json
index c08c6dddc..1287566ed 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json
index b27ead572..28e0ff4de 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0_0input" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json
index d18d7f03f..d6a10d7d4 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0_Gas2999" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json
index 48abed733..7e71434f6 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0_NoGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json
index 0ed1a9e5c..530f8a66d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0_completeReturnValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json
index f52c1d1a3..f540d47e8 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0_gas3000" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json
index 7f1a87150..aea7f7c2c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover0_overlappingInputOutput" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json
index 295f6bb18..875fc2806 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json
index dfe04e0c2..a5fe4c460 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json
index af39e38e4..83901b670 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json
index bd8ea6bd8..a30e6bd20 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecover80" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json
index b9f143772..e05664789 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecoverH_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json
index e22a2ebd0..9b6930d5c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecoverR_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json
index b226c67ec..f81b6b0d8 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecoverS_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json
index 3c999230f..6a6b48d34 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json
@@ -2,10 +2,10 @@
     "CALLCODEEcrecoverV_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json
index f4d1dac37..4ba0b1460 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentitiy_0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json
index 832be2fa7..43aa343ef 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentitiy_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json
index ada191320..aab8bbbfd 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_1_nonzeroValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json
index c9a096934..c6481a69f 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json
index 814fb5fca..ce1e24e18 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json
index 782bce348..25fd3ddfa 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json
index 4e3ebea21..4aaeca5eb 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_4_gas17" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json
index 070bc7137..b3a1c4588 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_4_gas18" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json
index 91d73b79c..05dde803c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json
@@ -2,10 +2,10 @@
     "CALLCODEIdentity_5" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json
index 6baa9c5b2..bc32bbab6 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json
index 18639efa8..7090b829d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json
index 763998a93..53e6b8679 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json
index 1c5bbca27..888088162 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json
index 617aef0ef..21b68c8ff 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_3_postfixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json
index dfd30d75e..c9cef641b 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_3_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json
index d0d617be2..53b99f670 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json
index 6d408eea6..674e232bd 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_4_gas719" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json
index 9e52578b1..b8c6c8619 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json
@@ -2,10 +2,10 @@
     "CALLCODERipemd160_5" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json
index 9e8229290..87623c36a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json
index 984f140d5..198558835 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json
index cfb61387f..9f6b40b0a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_1_nonzeroValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json
index d0b8a1daf..45849e0be 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json
index 07e5893a4..21565e8e8 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json
index d19589d73..d5d87c176 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_3_postfix0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json
index 926c8ba92..7683ebdec 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_3_prefix0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json
index feee373e7..513a9765e 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json
index 2004377fd..cdc7a954c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_4_gas99" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json
index c2bbca080..14cd5477a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json
@@ -2,10 +2,10 @@
     "CALLCODESha256_5" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json
index 0d8028817..48a3d9795 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json
@@ -2,10 +2,10 @@
     "CallEcrecover0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json
index 54d597817..74f9bf791 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json
@@ -2,10 +2,10 @@
     "CallEcrecover0_0input" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json
index d9e5f32c6..541d91e0b 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json
@@ -2,10 +2,10 @@
     "CallEcrecover0_Gas2999" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json
index 6f74ffe3a..b9ebff8f5 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json
@@ -2,10 +2,10 @@
     "CallEcrecover0_NoGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json
index 1336b3d48..8b525b479 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json
@@ -2,10 +2,10 @@
     "CallEcrecover0_completeReturnValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json
index c034bb027..daf3e2baa 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json
@@ -2,10 +2,10 @@
     "CallEcrecover0_gas3000" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json
index bb6a8380a..f961fb147 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json
@@ -2,10 +2,10 @@
     "CallEcrecover0_overlappingInputOutput" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json
index 77163577a..8efac98a7 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json
@@ -2,10 +2,10 @@
     "CallEcrecover1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json
index bd6eef878..729b420a9 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json
@@ -2,10 +2,10 @@
     "CallEcrecover2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json
index facd69cd7..ac2e6b9c9 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json
@@ -2,10 +2,10 @@
     "CallEcrecover3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json
index c4cfb99d7..dc1fb54bf 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json
@@ -2,10 +2,10 @@
     "CallEcrecover80" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json
index aa5839052..1d6bcd593 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json
@@ -2,10 +2,10 @@
     "CallEcrecoverCheckLength" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json
index f3557ad7a..9617dec4d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json
@@ -2,10 +2,10 @@
     "CallEcrecoverCheckLengthWrongV" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json
index 84964d819..2e4a31901 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json
@@ -2,10 +2,10 @@
     "CallEcrecoverH_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json
index a271126d9..f6b4cdb96 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json
@@ -2,10 +2,10 @@
     "CallEcrecoverR_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json
index ab07a4d0f..390139211 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json
@@ -2,10 +2,10 @@
     "CallEcrecoverS_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json
index d9d1331fa..a2fed11b4 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json
@@ -2,10 +2,10 @@
     "CallEcrecoverV_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json
index dc08b337e..b3adb37db 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json
@@ -2,10 +2,10 @@
     "CallIdentitiy_0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json
index fdfbd812e..86186f765 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json
@@ -2,10 +2,10 @@
     "CallIdentitiy_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json
index 54d83f31a..c0372e0f5 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json
@@ -2,10 +2,10 @@
     "CallIdentity_1_nonzeroValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json
index 42bbd5a76..1901398c3 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json
@@ -2,10 +2,10 @@
     "CallIdentity_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json
index 1eff07f05..25d84bc28 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json
@@ -2,10 +2,10 @@
     "CallIdentity_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json
index beb164965..3368c58f4 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json
@@ -2,10 +2,10 @@
     "CallIdentity_4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json
index f73fd4d7d..d52ec4b24 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json
@@ -2,10 +2,10 @@
     "CallIdentity_4_gas17" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json
index 16de4c6c7..8ddd2f034 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json
@@ -2,10 +2,10 @@
     "CallIdentity_4_gas18" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json
index 205ce25f2..ad14414d1 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json
@@ -2,10 +2,10 @@
     "CallIdentity_5" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json
index 8b6d28a34..73386a37c 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json
@@ -2,10 +2,10 @@
     "CallRipemd160_0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json
index c85e105ef..911869b0d 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json
@@ -2,10 +2,10 @@
     "CallRipemd160_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json
index 0fe8c9d4b..a2b9af02b 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json
@@ -2,10 +2,10 @@
     "CallRipemd160_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json
index bd6247523..b9f4ced18 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json
@@ -2,10 +2,10 @@
     "CallRipemd160_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json
index eed0e356e..2aa714b76 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json
@@ -2,10 +2,10 @@
     "CallRipemd160_3_postfixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json
index 4a4d75daf..dd3d7e6d3 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json
@@ -2,10 +2,10 @@
     "CallRipemd160_3_prefixed0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json
index 8161ff61d..54015fb57 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json
@@ -2,10 +2,10 @@
     "CallRipemd160_4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json
index cb81b0a15..106605d8f 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json
@@ -2,10 +2,10 @@
     "CallRipemd160_4_gas719" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json
index 466886177..2b8e2e4a7 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json
@@ -2,10 +2,10 @@
     "CallRipemd160_5" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json
index ba1dfa8c8..974d33869 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json
@@ -2,10 +2,10 @@
     "CallSha256_0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json
index 8253e65ca..e630b994a 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json
@@ -2,10 +2,10 @@
     "CallSha256_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json
index de4d77a64..a515ca4eb 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json
@@ -2,10 +2,10 @@
     "CallSha256_1_nonzeroValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json
index 6857af103..ea860ff57 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json
@@ -2,10 +2,10 @@
     "CallSha256_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json
index 1483899d3..a47bc2109 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json
@@ -2,10 +2,10 @@
     "CallSha256_3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json
index 3eb22607b..b37795beb 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json
@@ -2,10 +2,10 @@
     "CallSha256_3_postfix0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json
index cddc4e68f..d05551f47 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json
@@ -2,10 +2,10 @@
     "CallSha256_3_prefix0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json
index 75da3a4fb..d70f0f8eb 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json
@@ -2,10 +2,10 @@
     "CallSha256_4" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json
index 3f532b2b8..ba52bd098 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json
@@ -2,10 +2,10 @@
     "CallSha256_4_gas99" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json
index 076b6ceb2..4650595dd 100644
--- a/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json
+++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json
@@ -2,10 +2,10 @@
     "CallSha256_5" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stPreCompiledContracts/sec80.json b/GeneralStateTests/stPreCompiledContracts/sec80.json
index c0344a035..59d986d52 100644
--- a/GeneralStateTests/stPreCompiledContracts/sec80.json
+++ b/GeneralStateTests/stPreCompiledContracts/sec80.json
@@ -2,10 +2,10 @@
     "sec80" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRecursiveCreate/recursiveCreate.json b/GeneralStateTests/stRecursiveCreate/recursiveCreate.json
index cc47a3198..7675db50d 100644
--- a/GeneralStateTests/stRecursiveCreate/recursiveCreate.json
+++ b/GeneralStateTests/stRecursiveCreate/recursiveCreate.json
@@ -2,10 +2,10 @@
     "recursiveCreate" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json b/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json
index 25d3bf2a2..603b5fe92 100644
--- a/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json
+++ b/GeneralStateTests/stRecursiveCreate/recursiveCreateReturnValue.json
@@ -2,10 +2,10 @@
     "recursiveCreateReturnValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund50_1.json b/GeneralStateTests/stRefundTest/refund50_1.json
index e812c3c5c..650158a10 100644
--- a/GeneralStateTests/stRefundTest/refund50_1.json
+++ b/GeneralStateTests/stRefundTest/refund50_1.json
@@ -2,10 +2,10 @@
     "refund50_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund50_2.json b/GeneralStateTests/stRefundTest/refund50_2.json
index 76561bfa7..101404be7 100644
--- a/GeneralStateTests/stRefundTest/refund50_2.json
+++ b/GeneralStateTests/stRefundTest/refund50_2.json
@@ -2,10 +2,10 @@
     "refund50_2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund50percentCap.json b/GeneralStateTests/stRefundTest/refund50percentCap.json
index a1b7ee351..5d4d0a2f4 100644
--- a/GeneralStateTests/stRefundTest/refund50percentCap.json
+++ b/GeneralStateTests/stRefundTest/refund50percentCap.json
@@ -2,10 +2,10 @@
     "refund50percentCap" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund600.json b/GeneralStateTests/stRefundTest/refund600.json
index b0307c16a..4e0fd5f1b 100644
--- a/GeneralStateTests/stRefundTest/refund600.json
+++ b/GeneralStateTests/stRefundTest/refund600.json
@@ -2,10 +2,10 @@
     "refund600" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
index 29739a94c..02a55e57d 100644
--- a/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
+++ b/GeneralStateTests/stRefundTest/refundSuicide50procentCap.json
@@ -2,10 +2,10 @@
     "refundSuicide50procentCap" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallA.json b/GeneralStateTests/stRefundTest/refund_CallA.json
index 4f4c18e27..bf5ef2375 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA.json
@@ -2,10 +2,10 @@
     "refund_CallA" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
index 30c6d2247..24894f6d4 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA_OOG.json
@@ -2,10 +2,10 @@
     "refund_CallA_OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
index 5b3aea933..992303910 100644
--- a/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
+++ b/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall.json
@@ -2,10 +2,10 @@
     "refund_CallA_notEnoughGasInCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
index 08db51a2c..8e72d984c 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage.json
@@ -2,10 +2,10 @@
     "refund_CallToSuicideNoStorage" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
index d3a97ec87..a38d568ea 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage.json
@@ -2,10 +2,10 @@
     "refund_CallToSuicideStorage" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
index 87c7c860c..7a8d4d7e8 100644
--- a/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
+++ b/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice.json
@@ -2,10 +2,10 @@
     "refund_CallToSuicideTwice" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
index 6a1e07b10..ded664314 100644
--- a/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
+++ b/GeneralStateTests/stRefundTest/refund_NoOOG_1.json
@@ -2,10 +2,10 @@
     "refund_NoOOG_1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_OOG.json b/GeneralStateTests/stRefundTest/refund_OOG.json
index 2711de1d8..536b4f0e4 100644
--- a/GeneralStateTests/stRefundTest/refund_OOG.json
+++ b/GeneralStateTests/stRefundTest/refund_OOG.json
@@ -2,10 +2,10 @@
     "refund_OOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
index 3f4b566d3..795b75d49 100644
--- a/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_TxToSuicide.json
@@ -2,10 +2,10 @@
     "refund_TxToSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
index 035f184ef..4f7076fb7 100644
--- a/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
+++ b/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG.json
@@ -2,10 +2,10 @@
     "refund_TxToSuicideOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
index e5df5405a..c85e896ef 100644
--- a/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
+++ b/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage.json
@@ -2,10 +2,10 @@
     "refund_changeNonZeroStorage" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_getEtherBack.json b/GeneralStateTests/stRefundTest/refund_getEtherBack.json
index 96c825eef..20a61b37f 100644
--- a/GeneralStateTests/stRefundTest/refund_getEtherBack.json
+++ b/GeneralStateTests/stRefundTest/refund_getEtherBack.json
@@ -2,10 +2,10 @@
     "refund_getEtherBack" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x037c94",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
index 0b9e9f3aa..5ed3a9c92 100644
--- a/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_multimpleSuicide.json
@@ -2,10 +2,10 @@
     "refund_multimpleSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRefundTest/refund_singleSuicide.json b/GeneralStateTests/stRefundTest/refund_singleSuicide.json
index 9cf285130..247a05ed9 100644
--- a/GeneralStateTests/stRefundTest/refund_singleSuicide.json
+++ b/GeneralStateTests/stRefundTest/refund_singleSuicide.json
@@ -2,10 +2,10 @@
     "refund_singleSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json
index bad714214..16328c5fb 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert.json
@@ -2,10 +2,10 @@
     "LoopCallsDepthThenRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json
index 63eff78ca..bf18c3f88 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert2.json
@@ -2,10 +2,10 @@
     "LoopCallsDepthThenRevert2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json
index 871f486b4..2f72d5efc 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsDepthThenRevert3.json
@@ -2,10 +2,10 @@
     "LoopCallsDepthThenRevert3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json b/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json
index 5f09d29b7..ffd7d95b1 100644
--- a/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json
+++ b/GeneralStateTests/stRevertTest/LoopCallsThenRevert.json
@@ -2,10 +2,10 @@
     "LoopCallsThenRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json b/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json
index fa23e1b32..b29e4d07b 100644
--- a/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json
+++ b/GeneralStateTests/stRevertTest/LoopDelegateCallsDepthThenRevert.json
@@ -2,10 +2,10 @@
     "LoopDelegateCallsDepthThenRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json b/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json
index d6c1fe0b9..c9be062ed 100644
--- a/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json
+++ b/GeneralStateTests/stRevertTest/NashatyrevSuicideRevert.json
@@ -2,10 +2,10 @@
     "NashatyrevSuicideRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertDepth2.json b/GeneralStateTests/stRevertTest/RevertDepth2.json
index c2ee2cff1..fc12938ae 100644
--- a/GeneralStateTests/stRevertTest/RevertDepth2.json
+++ b/GeneralStateTests/stRevertTest/RevertDepth2.json
@@ -2,10 +2,10 @@
     "RevertDepth2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
index 24f03b24e..b48406798 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
@@ -2,10 +2,10 @@
     "RevertDepthCreateAddressCollision" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
index f8c3834f2..26ce17acb 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
@@ -2,10 +2,10 @@
     "RevertDepthCreateOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefound.json b/GeneralStateTests/stRevertTest/RevertPrefound.json
index 4dc021f06..0fe5f3aa9 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefound.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefound.json
@@ -2,10 +2,10 @@
     "RevertPrefound" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundCall.json b/GeneralStateTests/stRevertTest/RevertPrefoundCall.json
index 2f0ff52ed..3c2d885fa 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundCall.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundCall.json
@@ -2,10 +2,10 @@
     "RevertPrefoundCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json
index 2622e2e02..fb8f5ac9c 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundCallOOG.json
@@ -2,10 +2,10 @@
     "RevertPrefoundCallOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json
index b413be77f..c3200b7ff 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmpty.json
@@ -2,10 +2,10 @@
     "RevertPrefoundEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json
index 259a0b054..4c342e3da 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCall.json
@@ -2,10 +2,10 @@
     "RevertPrefoundEmptyCall" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json
index 82483c682..3231bd0e7 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyCallOOG.json
@@ -2,10 +2,10 @@
     "RevertPrefoundEmptyCallOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json
index cba2c8760..ba984010d 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundEmptyOOG.json
@@ -2,10 +2,10 @@
     "RevertPrefoundEmptyOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json b/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json
index a57ed58a2..f5b5457ce 100644
--- a/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertPrefoundOOG.json
@@ -2,10 +2,10 @@
     "RevertPrefoundOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json
index 1a720bc57..7d37ce56a 100644
--- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG.json
@@ -2,10 +2,10 @@
     "RevertRemoteSubCallStorageOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json
index ecbc6049f..43882a177 100644
--- a/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json
+++ b/GeneralStateTests/stRevertTest/RevertRemoteSubCallStorageOOG2.json
@@ -2,10 +2,10 @@
     "RevertRemoteSubCallStorageOOG2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json
index 2939159ae..a6071de30 100644
--- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json
+++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG.json
@@ -2,10 +2,10 @@
     "RevertSubCallStorageOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
index 1f24d5703..c624f4186 100644
--- a/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
+++ b/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2.json
@@ -2,10 +2,10 @@
     "RevertSubCallStorageOOG2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json
index 3c6e2fdc5..2764c8b4f 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert.json
@@ -2,10 +2,10 @@
     "TouchToEmptyAccountRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json
index 8310ceeef..43f9f0484 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert2.json
@@ -2,10 +2,10 @@
     "TouchToEmptyAccountRevert2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
index 7110bd531..2cdcb49fe 100644
--- a/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
+++ b/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert3.json
@@ -2,10 +2,10 @@
     "TouchToEmptyAccountRevert3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/AmbiguousMethod.json b/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
index 78d61ce92..bdb0eacf2 100644
--- a/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
+++ b/GeneralStateTests/stSolidityTest/AmbiguousMethod.json
@@ -2,10 +2,10 @@
     "AmbiguousMethod" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json b/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
index 3f865c973..fdd370cc8 100644
--- a/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
+++ b/GeneralStateTests/stSolidityTest/CallInfiniteLoop.json
@@ -2,10 +2,10 @@
     "CallInfiniteLoop" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json b/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
index b044eda5d..16bb2b8c8 100644
--- a/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
+++ b/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity.json
@@ -2,10 +2,10 @@
     "CallLowLevelCreatesSolidity" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json b/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
index 4cfe45f06..512c94dd9 100644
--- a/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
+++ b/GeneralStateTests/stSolidityTest/CallRecursiveMethods.json
@@ -2,10 +2,10 @@
     "CallRecursiveMethods" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/ContractInheritance.json b/GeneralStateTests/stSolidityTest/ContractInheritance.json
index 1459351b3..7295dbf4c 100644
--- a/GeneralStateTests/stSolidityTest/ContractInheritance.json
+++ b/GeneralStateTests/stSolidityTest/ContractInheritance.json
@@ -2,10 +2,10 @@
     "ContractInheritance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x78",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
index 0392c8c33..6cac8be24 100644
--- a/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
+++ b/GeneralStateTests/stSolidityTest/CreateContractFromMethod.json
@@ -2,10 +2,10 @@
     "CreateContractFromMethod" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
index 1eef61801..6bfa1921b 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContracts.json
@@ -2,10 +2,10 @@
     "RecursiveCreateContracts" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json b/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
index 0c866b888..6ca2a9c21 100644
--- a/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
+++ b/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts.json
@@ -2,10 +2,10 @@
     "RecursiveCreateContractsCreate4Contracts" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json b/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
index 13b78e203..5d5aa0e3e 100644
--- a/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
+++ b/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties.json
@@ -2,16 +2,16 @@
     "TestBlockAndTransactionProperties" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x78",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "a66273f6a501c2265ff804aa39467d5ced9d4e5dd9b8c6c2b1aadf285e97b778",
+                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "a66273f6a501c2265ff804aa39467d5ced9d4e5dd9b8c6c2b1aadf285e97b778",
+                    "hash" : "8121b6e7d79c473a20d195b45650a54bd1b95bc9f16392c2ce000e79c2351037",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "5c55e4635b0f5ff392e89266a8560c8b52cd75e95f5a2bdf56ddd72e9004cfb2",
+                    "hash" : "57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "5c55e4635b0f5ff392e89266a8560c8b52cd75e95f5a2bdf56ddd72e9004cfb2",
+                    "hash" : "57eb775f62aeaea7bfcddf7b359b805f5477c8217370d5d3c0e00e582fcfdb91",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSolidityTest/TestContractInteraction.json b/GeneralStateTests/stSolidityTest/TestContractInteraction.json
index 077a8c982..c4cf5f65e 100644
--- a/GeneralStateTests/stSolidityTest/TestContractInteraction.json
+++ b/GeneralStateTests/stSolidityTest/TestContractInteraction.json
@@ -2,10 +2,10 @@
     "TestContractInteraction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestContractSuicide.json b/GeneralStateTests/stSolidityTest/TestContractSuicide.json
index b6f946bd1..a6295ad05 100644
--- a/GeneralStateTests/stSolidityTest/TestContractSuicide.json
+++ b/GeneralStateTests/stSolidityTest/TestContractSuicide.json
@@ -2,10 +2,10 @@
     "TestContractSuicide" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json b/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
index 865a358aa..9691b068b 100644
--- a/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
+++ b/GeneralStateTests/stSolidityTest/TestCryptographicFunctions.json
@@ -2,10 +2,10 @@
     "TestCryptographicFunctions" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x78",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestKeywords.json b/GeneralStateTests/stSolidityTest/TestKeywords.json
index 3aa129703..563e8984c 100644
--- a/GeneralStateTests/stSolidityTest/TestKeywords.json
+++ b/GeneralStateTests/stSolidityTest/TestKeywords.json
@@ -2,10 +2,10 @@
     "TestKeywords" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestOverflow.json b/GeneralStateTests/stSolidityTest/TestOverflow.json
index 2f410014d..575d81f2a 100644
--- a/GeneralStateTests/stSolidityTest/TestOverflow.json
+++ b/GeneralStateTests/stSolidityTest/TestOverflow.json
@@ -2,10 +2,10 @@
     "TestOverflow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x78",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
index 47f4e04c4..ecbc2e3a7 100644
--- a/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
+++ b/GeneralStateTests/stSolidityTest/TestStoreGasPrices.json
@@ -2,10 +2,10 @@
     "TestStoreGasPrices" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x78",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json b/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
index 9530bd88a..8e7a25392 100644
--- a/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
+++ b/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless.json
@@ -2,10 +2,10 @@
     "TestStructuresAndVariabless" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x78",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/BadStateRootTx.json b/GeneralStateTests/stSpecialTest/BadStateRootTx.json
index 35074b5ae..240c4b1a1 100644
--- a/GeneralStateTests/stSpecialTest/BadStateRootTx.json
+++ b/GeneralStateTests/stSpecialTest/BadStateRootTx.json
@@ -2,10 +2,10 @@
     "BadStateRootTx" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json b/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
index fed4416d1..1093abdd7 100644
--- a/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
+++ b/GeneralStateTests/stSpecialTest/JUMPDEST_Attack.json
@@ -2,10 +2,10 @@
     "JUMPDEST_Attack" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json b/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
index fa17f8c33..4c8ef946a 100644
--- a/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
+++ b/GeneralStateTests/stSpecialTest/JUMPDEST_AttackwithJump.json
@@ -2,10 +2,10 @@
     "JUMPDEST_AttackwithJump" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json b/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
index aab7f820c..622269f6d 100644
--- a/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
+++ b/GeneralStateTests/stSpecialTest/OverflowGasMakeMoney.json
@@ -2,10 +2,10 @@
     "OverflowGasMakeMoney" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
index 4476f8e82..2f8fc546e 100644
--- a/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
+++ b/GeneralStateTests/stSpecialTest/StackDepthLimitSEC.json
@@ -2,10 +2,10 @@
     "StackDepthLimitSEC" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/block504980.json b/GeneralStateTests/stSpecialTest/block504980.json
index ae7abb889..0dbc312ba 100644
--- a/GeneralStateTests/stSpecialTest/block504980.json
+++ b/GeneralStateTests/stSpecialTest/block504980.json
@@ -2,16 +2,16 @@
     "block504980" : {
         "env" : {
             "currentCoinbase" : "1cdc8315bdb1362de8b7b2fa9ee75dc873037179",
-            "currentDifficulty" : "0x04e44ea721",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x2fefd8",
-            "currentNumber" : "0x07b494",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "9ff4de714e01da9f8b61992efdab9b51ca14ac42d43f4c24df1d002a1239b1e9"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "4942ffaa214cd58f2171ec519ceed8ef47faf9ca81af8d912ec6e0db22626cff",
+                    "hash" : "933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "4efe4fa1148814989ce218f98d8ae030ff81652434fab1d47a12cfbf15beb329",
+                    "hash" : "933c40bf2ae3cb437f9ae9a3fb2fa5f69b74ef40a6ee6fcd592e114d39242904",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "4ac24e3a630456e47fc48b3eaca67086047443b5152267eefc5f08a337f1ac03",
+                    "hash" : "feecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "4ac24e3a630456e47fc48b3eaca67086047443b5152267eefc5f08a337f1ac03",
+                    "hash" : "feecee5008c30a0e1ea56177c862cdee3a3c356a6c1d2d7732e6c5989f5f53e4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSpecialTest/gasPrice0.json b/GeneralStateTests/stSpecialTest/gasPrice0.json
index 28d9e443c..ac5317179 100644
--- a/GeneralStateTests/stSpecialTest/gasPrice0.json
+++ b/GeneralStateTests/stSpecialTest/gasPrice0.json
@@ -2,10 +2,10 @@
     "gasPrice0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/makeMoney.json b/GeneralStateTests/stSpecialTest/makeMoney.json
index 19bdbf42d..1561dca85 100644
--- a/GeneralStateTests/stSpecialTest/makeMoney.json
+++ b/GeneralStateTests/stSpecialTest/makeMoney.json
@@ -2,10 +2,10 @@
     "makeMoney" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/sha3_deja.json b/GeneralStateTests/stSpecialTest/sha3_deja.json
index e73058275..431930d5b 100644
--- a/GeneralStateTests/stSpecialTest/sha3_deja.json
+++ b/GeneralStateTests/stSpecialTest/sha3_deja.json
@@ -2,10 +2,10 @@
     "sha3_deja" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/txCost-sec73.json b/GeneralStateTests/stSpecialTest/txCost-sec73.json
index f058a2b96..de0166918 100644
--- a/GeneralStateTests/stSpecialTest/txCost-sec73.json
+++ b/GeneralStateTests/stSpecialTest/txCost-sec73.json
@@ -2,10 +2,10 @@
     "txCost-sec73" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSpecialTest/tx_e1c174e2.json b/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
index 053f3ba92..89f9db868 100644
--- a/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
+++ b/GeneralStateTests/stSpecialTest/tx_e1c174e2.json
@@ -2,10 +2,10 @@
     "tx_e1c174e2" : {
         "env" : {
             "currentCoinbase" : "68795C4AA09D6f4Ed3E5DeDDf8c2AD3049A601da",
-            "currentDifficulty" : "0x0a59b0888b70",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x2fefd8",
-            "currentNumber" : "0x0ef655",
-            "currentTimestamp" : "0x56ba9cf8",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
index 18549239e..3562c95c0 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls0.json
@@ -2,10 +2,10 @@
     "ABAcalls0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
index dea69b989..3a4b92d74 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls1.json
@@ -2,10 +2,10 @@
     "ABAcalls1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x3b9aca00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
index e0289399a..14a411ee5 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls2.json
@@ -2,10 +2,10 @@
     "ABAcalls2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x3b9aca00",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json b/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
index c115d7fac..20cd68338 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcalls3.json
@@ -2,10 +2,10 @@
     "ABAcalls3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
index 0779b2d0b..cc9736959 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide0.json
@@ -2,10 +2,10 @@
     "ABAcallsSuicide0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
index e53d2175a..dfe9eaee5 100644
--- a/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
+++ b/GeneralStateTests/stSystemOperationsTest/ABAcallsSuicide1.json
@@ -2,10 +2,10 @@
     "ABAcallsSuicide1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/Call10.json b/GeneralStateTests/stSystemOperationsTest/Call10.json
index 63239185f..26356a7cc 100644
--- a/GeneralStateTests/stSystemOperationsTest/Call10.json
+++ b/GeneralStateTests/stSystemOperationsTest/Call10.json
@@ -2,10 +2,10 @@
     "Call10" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
index 930b511e9..1a6f8370b 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0.json
@@ -2,10 +2,10 @@
     "CallRecursiveBomb0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
index 14596669c..9849c9775 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepth.json
@@ -2,10 +2,10 @@
     "CallRecursiveBomb0_OOG_atMaxCallDepth" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x174876e800",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
index 51ed37dfa..baa2dda03 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb1.json
@@ -2,10 +2,10 @@
     "CallRecursiveBomb1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
index b99af6b83..b26dd806e 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb2.json
@@ -2,10 +2,10 @@
     "CallRecursiveBomb2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
index dff3edbac..d3284af18 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBomb3.json
@@ -2,10 +2,10 @@
     "CallRecursiveBomb3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
index 86ee74cb1..656e4fdba 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombLog" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
index 174f2c9d7..c762d0c3b 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallRecursiveBombLog2.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombLog2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
index f2425425a..33a83504a 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistrator0.json
@@ -2,10 +2,10 @@
     "CallToNameRegistrator0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
index 437abd539..0150a1729 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeft.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorAddressTooBigLeft" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
index 428594d7f..b1350657f 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRight.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorAddressTooBigRight" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
index 7bc1c3571..aba03d14f 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalance.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorMemOOGAndInsufficientBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
index e2ea3ccb4..9d26dfd20 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorNotMuchMemory0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
index c3ddfbec9..3d647041b 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorNotMuchMemory1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
index aaab453b3..4b4dfc861 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorOutOfGas.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorOutOfGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
index cd9d6a745..bed3336e0 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorTooMuchMemory0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
index d920c8eef..c356246ad 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorTooMuchMemory1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
index cc3cf3374..afe1d2a11 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorTooMuchMemory2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
index b6ab1d4a5..703e80e65 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansion.json
@@ -2,10 +2,10 @@
     "CallToNameRegistratorZeorSizeMemExpansion" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
index c86b03ff8..df05230d1 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1.json
@@ -2,10 +2,10 @@
     "CallToReturn1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
index 885709564..14f625f70 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump0.json
@@ -2,10 +2,10 @@
     "CallToReturn1ForDynamicJump0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
index bfee24b80..33d962484 100644
--- a/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
+++ b/GeneralStateTests/stSystemOperationsTest/CallToReturn1ForDynamicJump1.json
@@ -2,10 +2,10 @@
     "CallToReturn1ForDynamicJump1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json b/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
index 193a3211d..0214d48ad 100644
--- a/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
+++ b/GeneralStateTests/stSystemOperationsTest/CalltoReturn2.json
@@ -2,10 +2,10 @@
     "CalltoReturn2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
index 5c479a365..e2f4e98eb 100644
--- a/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
+++ b/GeneralStateTests/stSystemOperationsTest/CreateHashCollision.json
@@ -2,10 +2,10 @@
     "CreateHashCollision" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json b/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
index b7cdc2d4b..030e7b9c9 100644
--- a/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/PostToReturn1.json
@@ -2,10 +2,10 @@
     "PostToReturn1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json b/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
index a93f14948..fdf18aafd 100644
--- a/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
+++ b/GeneralStateTests/stSystemOperationsTest/TestNameRegistrator.json
@@ -2,10 +2,10 @@
     "TestNameRegistrator" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json b/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
index e85b161d9..84af6091b 100644
--- a/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
+++ b/GeneralStateTests/stSystemOperationsTest/balanceInputAddressTooBig.json
@@ -2,10 +2,10 @@
     "balanceInputAddressTooBig" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callValue.json b/GeneralStateTests/stSystemOperationsTest/callValue.json
index 3056fc680..4d8c48e49 100644
--- a/GeneralStateTests/stSystemOperationsTest/callValue.json
+++ b/GeneralStateTests/stSystemOperationsTest/callValue.json
@@ -2,10 +2,10 @@
     "callValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json b/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
index 975a78c1e..63412cdb9 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeTo0.json
@@ -2,10 +2,10 @@
     "callcodeTo0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
index ba88dc58c..bee893156 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistrator0.json
@@ -2,10 +2,10 @@
     "callcodeToNameRegistrator0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
index c15f8a0ee..a35d2e7d1 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeft.json
@@ -2,10 +2,10 @@
     "callcodeToNameRegistratorAddresTooBigLeft" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
index 40a768c66..15d01144e 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRight.json
@@ -2,10 +2,10 @@
     "callcodeToNameRegistratorAddresTooBigRight" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
index c9a5a2467..f8f9c40bd 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanion.json
@@ -2,10 +2,10 @@
     "callcodeToNameRegistratorZeroMemExpanion" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json b/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
index b66ff1c51..12f91c5aa 100644
--- a/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
+++ b/GeneralStateTests/stSystemOperationsTest/callcodeToReturn1.json
@@ -2,10 +2,10 @@
     "callcodeToReturn1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json b/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
index 823ae579e..97479ddbb 100644
--- a/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/callerAccountBalance.json
@@ -2,10 +2,10 @@
     "callerAccountBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
index eb0fa2980..cf8cc3b65 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistrator.json
@@ -2,10 +2,10 @@
     "createNameRegistrator" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
index aeb23840c..dc1e6a415 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOV.json
@@ -2,10 +2,10 @@
     "createNameRegistratorOOG_MemExpansionOOV" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
index 6976bed29..e3d6c191f 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0.json
@@ -2,10 +2,10 @@
     "createNameRegistratorOutOfMemoryBonds0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
index c151022cb..6081490c0 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1.json
@@ -2,10 +2,10 @@
     "createNameRegistratorOutOfMemoryBonds1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
index 6a74f0c00..dc235501d 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorValueTooHigh.json
@@ -2,10 +2,10 @@
     "createNameRegistratorValueTooHigh" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
index ab2816b57..bd88622d9 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem.json
@@ -2,10 +2,10 @@
     "createNameRegistratorZeroMem" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
index 4b247a684..34d5eee94 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMem2.json
@@ -2,10 +2,10 @@
     "createNameRegistratorZeroMem2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
index aee10596f..cf5290ffa 100644
--- a/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
+++ b/GeneralStateTests/stSystemOperationsTest/createNameRegistratorZeroMemExpansion.json
@@ -2,10 +2,10 @@
     "createNameRegistratorZeroMemExpansion" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json b/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
index 8d5bfcb53..de5c9365b 100644
--- a/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
+++ b/GeneralStateTests/stSystemOperationsTest/createWithInvalidOpcode.json
@@ -2,16 +2,16 @@
     "createWithInvalidOpcode" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x012c",
-            "currentTimestamp" : "0x02",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "76b36b2601bc8db861e9607a992377e90e1652bc961b14e840f67a6f06703307",
+                    "hash" : "36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "76b36b2601bc8db861e9607a992377e90e1652bc961b14e840f67a6f06703307",
+                    "hash" : "36a506299d0982a91b9bf1d7f1f1415300eef03b33597d4d05b85c7db2854ccf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json b/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
index 6c1a0dd00..a56d66c6b 100644
--- a/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
+++ b/GeneralStateTests/stSystemOperationsTest/currentAccountBalance.json
@@ -2,10 +2,10 @@
     "currentAccountBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
index 295529284..ae96980be 100644
--- a/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
+++ b/GeneralStateTests/stSystemOperationsTest/extcodecopy.json
@@ -2,10 +2,10 @@
     "extcodecopy" : {
         "env" : {
             "currentCoinbase" : "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
-            "currentDifficulty" : "0x7fb7d889155ce8c6",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x58272e28",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xa4befad141d51c4f",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "d30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/return0.json b/GeneralStateTests/stSystemOperationsTest/return0.json
index af89bd89a..3dccb4090 100644
--- a/GeneralStateTests/stSystemOperationsTest/return0.json
+++ b/GeneralStateTests/stSystemOperationsTest/return0.json
@@ -2,10 +2,10 @@
     "return0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/return1.json b/GeneralStateTests/stSystemOperationsTest/return1.json
index 1f4f2bd98..0dbf352c3 100644
--- a/GeneralStateTests/stSystemOperationsTest/return1.json
+++ b/GeneralStateTests/stSystemOperationsTest/return1.json
@@ -2,10 +2,10 @@
     "return1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/return2.json b/GeneralStateTests/stSystemOperationsTest/return2.json
index 1a0b339da..e53036e76 100644
--- a/GeneralStateTests/stSystemOperationsTest/return2.json
+++ b/GeneralStateTests/stSystemOperationsTest/return2.json
@@ -2,10 +2,10 @@
     "return2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideAddress.json b/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
index 7802ef99d..1bdb8ba38 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideAddress.json
@@ -2,10 +2,10 @@
     "suicideAddress" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCaller.json b/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
index cd801917a..42c77aebd 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCaller.json
@@ -2,10 +2,10 @@
     "suicideCaller" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
index 4fadebff2..ce61ee477 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigLeft.json
@@ -2,10 +2,10 @@
     "suicideCallerAddresTooBigLeft" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
index 8c60eeae0..e093c8e59 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCallerAddresTooBigRight.json
@@ -2,10 +2,10 @@
     "suicideCallerAddresTooBigRight" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
index ba0f0104e..0d97ba1f0 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideCoinbase.json
@@ -2,10 +2,10 @@
     "suicideCoinbase" : {
         "env" : {
             "currentCoinbase" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json b/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
index 4c6602ed7..32b60ea7f 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideNotExistingAccount.json
@@ -2,10 +2,10 @@
     "suicideNotExistingAccount" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json b/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
index 050dfb020..27bae4439 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideOrigin.json
@@ -2,10 +2,10 @@
     "suicideOrigin" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
index a576d6b41..c07262ead 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherPostDeath.json
@@ -2,10 +2,10 @@
     "suicideSendEtherPostDeath" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
index dca10f8bb..f8c1a9039 100644
--- a/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
+++ b/GeneralStateTests/stSystemOperationsTest/suicideSendEtherToMe.json
@@ -2,10 +2,10 @@
     "suicideSendEtherToMe" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stSystemOperationsTest/testRandomTest.json b/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
index 776f16076..afbd32bac 100644
--- a/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
+++ b/GeneralStateTests/stSystemOperationsTest/testRandomTest.json
@@ -2,16 +2,16 @@
     "testRandomTest" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x012c",
-            "currentTimestamp" : "0x02",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ca1cfe00ac7137e27bfadba1a8d485c1cb74e758fc1524d0428bbab5b7a79020",
+                    "hash" : "3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "569622419cc0da26f90ebb5ae3e9e94ea8eb0537d2451ae4c8fbe206114c1a1d",
+                    "hash" : "574a120dbb90647527d2be3cb7de28a73a7eaced54d64994d5d53636ac27f403",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "ca1cfe00ac7137e27bfadba1a8d485c1cb74e758fc1524d0428bbab5b7a79020",
+                    "hash" : "3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ca1cfe00ac7137e27bfadba1a8d485c1cb74e758fc1524d0428bbab5b7a79020",
+                    "hash" : "3a214e481c7334bd0d5e649795d955ec52badbf5df4988c47c9de6266257a932",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
index 0aa9608ef..d553b9018 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG.json
@@ -2,10 +2,10 @@
     "ContractStoreClearsOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0186a0",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
index 6aa95c33b..7834f6090 100644
--- a/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/ContractStoreClearsSuccess.json
@@ -2,10 +2,10 @@
     "ContractStoreClearsSuccess" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
index 13f5774cf..70183aece 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageReverted.json
@@ -2,10 +2,10 @@
     "CreateMessageReverted" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
index c70db352c..5ddcb920f 100644
--- a/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateMessageSuccess.json
@@ -2,10 +2,10 @@
     "CreateMessageSuccess" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
index 9c60590a1..e71ecabc7 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionReverted.json
@@ -2,10 +2,10 @@
     "CreateTransactionReverted" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
index 4d1199b9e..fdd577308 100644
--- a/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
+++ b/GeneralStateTests/stTransactionTest/CreateTransactionSuccess.json
@@ -2,10 +2,10 @@
     "CreateTransactionSuccess" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xe8d4a51000",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction.json b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
index 71d48d4ac..ac873b54c 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction.json
@@ -2,10 +2,10 @@
     "EmptyTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
index 23b1fae5d..b7c0fa4d7 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction2.json
@@ -2,10 +2,10 @@
     "EmptyTransaction2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
index 54b1b2716..c12b16d78 100644
--- a/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
+++ b/GeneralStateTests/stTransactionTest/EmptyTransaction3.json
@@ -2,10 +2,10 @@
     "EmptyTransaction3" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/HighGasLimit.json b/GeneralStateTests/stTransactionTest/HighGasLimit.json
index 206489fbc..6ac0d79d9 100644
--- a/GeneralStateTests/stTransactionTest/HighGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/HighGasLimit.json
@@ -2,10 +2,10 @@
     "HighGasLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
index 985cd0510..ec03b092a 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit.json
@@ -2,10 +2,10 @@
     "InternalCallHittingGasLimit" : {
         "env" : {
             "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x55f0",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
index 690c1946c..b1c7ac1f5 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimit2.json
@@ -2,10 +2,10 @@
     "InternalCallHittingGasLimit2" : {
         "env" : {
             "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0xba96",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
index 3698ff31a..cebb6f67b 100644
--- a/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
+++ b/GeneralStateTests/stTransactionTest/InternalCallHittingGasLimitSuccess.json
@@ -2,10 +2,10 @@
     "InternalCallHittingGasLimitSuccess" : {
         "env" : {
             "currentCoinbase" : "2adf5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x035b60",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
index 586b1a9db..4c4ad00bc 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsOOG.json
@@ -2,10 +2,10 @@
     "InternlCallStoreClearsOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
index bfd75b434..59aa7cc2a 100644
--- a/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
+++ b/GeneralStateTests/stTransactionTest/InternlCallStoreClearsSucces.json
@@ -2,10 +2,10 @@
     "InternlCallStoreClearsSucces" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
index 9a22eac78..1c999e2de 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire.json
@@ -2,10 +2,10 @@
     "OverflowGasRequire" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
index 817150dda..747a6617f 100644
--- a/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
+++ b/GeneralStateTests/stTransactionTest/OverflowGasRequire2.json
@@ -2,10 +2,10 @@
     "OverflowGasRequire2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow.json b/GeneralStateTests/stTransactionTest/RefundOverflow.json
index e7cafbabf..98966c566 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow.json
@@ -2,10 +2,10 @@
     "RefundOverflow" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/RefundOverflow2.json b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
index 4243d74d7..2b1908996 100644
--- a/GeneralStateTests/stTransactionTest/RefundOverflow2.json
+++ b/GeneralStateTests/stTransactionTest/RefundOverflow2.json
@@ -2,10 +2,10 @@
     "RefundOverflow2" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x7fffffffffffffff",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
index e76acce8d..d6bd01d4a 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsOOG.json
@@ -2,10 +2,10 @@
     "StoreClearsAndInternlCallStoreClearsOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
index 021655727..30c05941b 100644
--- a/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
+++ b/GeneralStateTests/stTransactionTest/StoreClearsAndInternlCallStoreClearsSuccess.json
@@ -2,10 +2,10 @@
     "StoreClearsAndInternlCallStoreClearsSuccess" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
index 603569fa7..d96a30881 100644
--- a/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
+++ b/GeneralStateTests/stTransactionTest/StoreGasOnCreate.json
@@ -2,10 +2,10 @@
     "StoreGasOnCreate" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
index f92996e69..d159bc72c 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCall.json
@@ -2,10 +2,10 @@
     "SuicidesAndInternlCallSuicidesBonusGasAtCall" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
index f75bb498c..c43dcaa79 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesBonusGasAtCallFailed.json
@@ -2,10 +2,10 @@
     "SuicidesAndInternlCallSuicidesBonusGasAtCallFailed" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
index 1a2194843..6ff01120d 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesOOG.json
@@ -2,10 +2,10 @@
     "SuicidesAndInternlCallSuicidesOOG" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
index 2964150f1..d31c8f8db 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndInternlCallSuicidesSuccess.json
@@ -2,10 +2,10 @@
     "SuicidesAndInternlCallSuicidesSuccess" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
index d52f76753..77e9b5256 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesAndSendMoneyToItselfEtherDestroyed.json
@@ -2,10 +2,10 @@
     "SuicidesAndSendMoneyToItselfEtherDestroyed" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
index fd748dd96..381a767aa 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesMixingCoinbase.json
@@ -2,10 +2,10 @@
     "SuicidesMixingCoinbase" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
index 70664d458..3000a9af7 100644
--- a/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
+++ b/GeneralStateTests/stTransactionTest/SuicidesStopAfterSuicide.json
@@ -2,10 +2,10 @@
     "SuicidesStopAfterSuicide" : {
         "env" : {
             "currentCoinbase" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0186a0",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
index 6c412b3f1..421a146af 100644
--- a/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
+++ b/GeneralStateTests/stTransactionTest/TransactionDataCosts652.json
@@ -2,10 +2,10 @@
     "TransactionDataCosts652" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
index dcc70d889..0c95c800a 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit.json
@@ -2,10 +2,10 @@
     "TransactionFromCoinbaseHittingBlockGasLimit" : {
         "env" : {
             "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x526c",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
index f5f4bf396..2f7dc65a1 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseHittingBlockGasLimit1.json
@@ -2,10 +2,10 @@
     "TransactionFromCoinbaseHittingBlockGasLimit1" : {
         "env" : {
             "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x526c",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
index 2da178b0c..272c5204f 100644
--- a/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionFromCoinbaseNotEnoughFounds.json
@@ -2,10 +2,10 @@
     "TransactionFromCoinbaseNotEnoughFounds" : {
         "env" : {
             "currentCoinbase" : "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "currentDifficulty" : "0x02b8feb0",
-            "currentGasLimit" : "0x044c",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x01adb0",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
index d0284a9c6..1cf890031 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck.json
@@ -2,10 +2,10 @@
     "TransactionNonceCheck" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
index 3490955cb..37d84266e 100644
--- a/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
+++ b/GeneralStateTests/stTransactionTest/TransactionNonceCheck2.json
@@ -2,10 +2,10 @@
     "TransactionNonceCheck2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
index 3e37edc26..4c73370e5 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToEmpty.json
@@ -2,10 +2,10 @@
     "TransactionSendingToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
index 0a260003e..334516cef 100644
--- a/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
+++ b/GeneralStateTests/stTransactionTest/TransactionSendingToZero.json
@@ -2,10 +2,10 @@
     "TransactionSendingToZero" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
index 9254937b3..b11fff50f 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToAddressh160minusOne.json
@@ -2,10 +2,10 @@
     "TransactionToAddressh160minusOne" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0186a0",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItself.json b/GeneralStateTests/stTransactionTest/TransactionToItself.json
index 214ecbd1d..dab2d8f98 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItself.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItself.json
@@ -2,10 +2,10 @@
     "TransactionToItself" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
index 2348d1a22..15d875cec 100644
--- a/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
+++ b/GeneralStateTests/stTransactionTest/TransactionToItselfNotEnoughFounds.json
@@ -2,10 +2,10 @@
     "TransactionToItselfNotEnoughFounds" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
index f23825c0c..4fbcd485d 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionGasLimitIsTooLowWhenZeroCost.json
@@ -2,10 +2,10 @@
     "UserTransactionGasLimitIsTooLowWhenZeroCost" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x05f5e100",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
index 7908982db..80fa1c387 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCost.json
@@ -2,10 +2,10 @@
     "UserTransactionZeroCost" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
index 4140db4cb..0628e9d1d 100644
--- a/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
+++ b/GeneralStateTests/stTransactionTest/UserTransactionZeroCostWithData.json
@@ -2,10 +2,10 @@
     "UserTransactionZeroCostWithData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
index 2cbf0005c..44bf77e7c 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAfter.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c31",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
index 5c8d8eaf9..a1a384f22 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsAt.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsAt" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
index 58588abd3..71ba28fc4 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsBefore.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c2f",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
index 52d34e6fd..a11119006 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAfter.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGasAfter" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c31",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
index bd5c70ef3..65c7eff62 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasAt.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGasAt" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
index bb858879f..122933b3b 100644
--- a/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
+++ b/GeneralStateTests/stTransitionTest/createNameRegistratorPerTxsNotEnoughGasBefore.json
@@ -2,10 +2,10 @@
     "createNameRegistratorPerTxsNotEnoughGasBefore" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x02540be400",
             "currentNumber" : "0x118c2f",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json b/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
index d7ce77c87..fdd0967dd 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallAfterTransition.json
@@ -2,10 +2,10 @@
     "delegatecallAfterTransition" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x118c31",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json b/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
index ba15f11d1..20b9c76d1 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallAtTransition.json
@@ -2,10 +2,10 @@
     "delegatecallAtTransition" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
-            "currentNumber" : "0x118c30",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json b/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
index 4f53d6258..55f240b40 100644
--- a/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
+++ b/GeneralStateTests/stTransitionTest/delegatecallBeforeTransition.json
@@ -2,10 +2,10 @@
     "delegatecallBeforeTransition" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x01c9c380",
             "currentNumber" : "0x118c2f",
-            "currentTimestamp" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstruction.json b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
index 9dab6deb1..cada718c3 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstruction.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstruction.json
@@ -1,17 +1,17 @@
 {
-    "dayLimitConstruction " : {
+    "dayLimitConstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "f225f2559b4fc4aee19024e0b91fb9b08a8e60a9ed5bfeed243304fda7dbc085",
+                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "afa10cbed56d94a198246670b71ab820d3f3e53433eff42c787d94308aecb02f",
+                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b497a0b8e92fb3f2bbaf3c3b614b41ec501e1faf4e7b4f6952bde008a4efa0cd",
+                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "b497a0b8e92fb3f2bbaf3c3b614b41ec501e1faf4e7b4f6952bde008a4efa0cd",
+                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json b/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
index a045b6e63..64e7d3886 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionOOG.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitConstructionOOG " : {
+    "dayLimitConstructionOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "7757eb985d0d319cd645a63d5ce9cecbfb8bb4ea3d481d3c1a8a171d8804c78c",
+                    "hash" : "adcf2b13c275760d72cf61dc682be74826170608f8ef2b352b3612dbe45aaec7",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
index 522bfc66f..29a4a0f45 100644
--- a/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/dayLimitConstructionPartial.json
@@ -1,17 +1,17 @@
 {
-    "dayLimitConstructionPartial " : {
+    "dayLimitConstructionPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "ee7fe1365c006ad0822e65b9f897444f2d41a7d88d514a322eb52d92c5730624",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "ee7fe1365c006ad0822e65b9f897444f2d41a7d88d514a322eb52d92c5730624",
+                    "hash" : "56e9417d578f0432f2ddf356c7cedadaf71ea194494d8f288ca2ea7fe39fda32",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "b497a0b8e92fb3f2bbaf3c3b614b41ec501e1faf4e7b4f6952bde008a4efa0cd",
+                    "hash" : "0ee86fc01d7944c33b3b8babbc4f94d9043ce11d7524cf7d7dcd528e8a830815",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "ee7fe1365c006ad0822e65b9f897444f2d41a7d88d514a322eb52d92c5730624",
+                    "hash" : "a7ed609d610d1a11fd22807e6c8bb8a2e6764838af4c0a183e90d5424ad2ee7e",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json b/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
index faf35cf95..90cfaba53 100644
--- a/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
+++ b/GeneralStateTests/stWalletTest/dayLimitResetSpentToday.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitResetSpentToday " : {
+    "dayLimitResetSpentToday" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
index eebd9ed0e..4c40a5f69 100644
--- a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
+++ b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimit.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitSetDailyLimit " : {
+    "dayLimitSetDailyLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
index 4715c156e..3687f972d 100644
--- a/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
+++ b/GeneralStateTests/stWalletTest/dayLimitSetDailyLimitNoData.json
@@ -1,11 +1,11 @@
 {
-    "dayLimitSetDailyLimitNoData " : {
+    "dayLimitSetDailyLimitNoData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json b/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
index 62d4712c6..f9f4ce320 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedAddOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedAddOwner " : {
+    "multiOwnedAddOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json b/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
index 025344f9e..1244d02b1 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedAddOwnerAddMyself.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedAddOwnerAddMyself " : {
+    "multiOwnedAddOwnerAddMyself" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
index 73ed6b102..53ddcdb42 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner " : {
+    "multiOwnedChangeOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
index 62cd49c4a..8b3007118 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwnerNoArgument.json
@@ -2,10 +2,10 @@
     "multiOwnedChangeOwnerNoArgument" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
index ef9450841..a3afc0986 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_fromNotOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner_fromNotOwner " : {
+    "multiOwnedChangeOwner_fromNotOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
index d4688ddfa..50a0589a4 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeOwner_toIsOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeOwner_toIsOwner " : {
+    "multiOwnedChangeOwner_toIsOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
index 1cca7a199..cf39a4d59 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo0.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo0 " : {
+    "multiOwnedChangeRequirementTo0" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
index 82638e3f5..8acf385d2 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo1.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo1 " : {
+    "multiOwnedChangeRequirementTo1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
index cb550904a..49b834542 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedChangeRequirementTo2.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedChangeRequirementTo2 " : {
+    "multiOwnedChangeRequirementTo2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
index db3afd8df..6b62ca32f 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionCorrect.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionCorrect " : {
+    "multiOwnedConstructionCorrect" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
index d5e9e50a0..8d73b05cb 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGas.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionNotEnoughGas " : {
+    "multiOwnedConstructionNotEnoughGas" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x0f4240",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
index d6df67633..4ee1a67a5 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedConstructionNotEnoughGasPartial.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedConstructionNotEnoughGasPartial " : {
+    "multiOwnedConstructionNotEnoughGasPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
index 49e9c06ce..b3ff665cc 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerFalse.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedIsOwnerFalse " : {
+    "multiOwnedIsOwnerFalse" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
index 8701604c9..bb410ea36 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedIsOwnerTrue.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedIsOwnerTrue " : {
+    "multiOwnedIsOwnerTrue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
index 505862302..0d1f849a4 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner " : {
+    "multiOwnedRemoveOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
index 38a3a0728..4c63ec6d0 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwnerByNonOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwnerByNonOwner " : {
+    "multiOwnedRemoveOwnerByNonOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
index bdfc014a5..b32804460 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_mySelf.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner_mySelf " : {
+    "multiOwnedRemoveOwner_mySelf" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
index 67ff69eb3..ca4679306 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRemoveOwner_ownerIsNotOwner.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRemoveOwner_ownerIsNotOwner " : {
+    "multiOwnedRemoveOwner_ownerIsNotOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json b/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
index 04c09a8d1..c44ac0264 100644
--- a/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
+++ b/GeneralStateTests/stWalletTest/multiOwnedRevokeNothing.json
@@ -1,11 +1,11 @@
 {
-    "multiOwnedRevokeNothing " : {
+    "multiOwnedRevokeNothing" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
index a2a5639ce..f5719463b 100644
--- a/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletAddOwnerRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletAddOwnerRemovePendingTransaction " : {
+    "walletAddOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
index 3e3294d11..84573872c 100644
--- a/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeOwnerRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletChangeOwnerRemovePendingTransaction " : {
+    "walletChangeOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
index ec0a5f0bc..c86b027e0 100644
--- a/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletChangeRequirementRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletChangeRequirementRemovePendingTransaction " : {
+    "walletChangeRequirementRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletConfirm.json b/GeneralStateTests/stWalletTest/walletConfirm.json
index 1d2fe8cde..ab028e0f4 100644
--- a/GeneralStateTests/stWalletTest/walletConfirm.json
+++ b/GeneralStateTests/stWalletTest/walletConfirm.json
@@ -1,11 +1,11 @@
 {
-    "walletConfirm " : {
+    "walletConfirm" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletConstruction.json b/GeneralStateTests/stWalletTest/walletConstruction.json
index 13650b37c..8feb73c6e 100644
--- a/GeneralStateTests/stWalletTest/walletConstruction.json
+++ b/GeneralStateTests/stWalletTest/walletConstruction.json
@@ -1,17 +1,17 @@
 {
-    "walletConstruction " : {
+    "walletConstruction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -29,7 +29,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "fc08ac63b6a8002515ba5b39754c4bf07ce7c9d1e3c74fd6491336cfe8197a5c",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "c26d9edc7d3a7869a06febbdf5f89fe361263fabd6b4e69919e2d4686360f24a",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -65,7 +65,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/walletConstructionOOG.json b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
index 977dda1d4..0fa468a42 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionOOG.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionOOG.json
@@ -1,11 +1,11 @@
 {
-    "walletConstructionOOG " : {
+    "walletConstructionOOG" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
@@ -19,7 +19,7 @@
                     }
                 },
                 {
-                    "hash" : "cfb28c1ba1d5dda09a48def32e6be10cdbc290e63b85769a85e27b68ab0bc6ef",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -37,7 +37,7 @@
                     }
                 },
                 {
-                    "hash" : "cfb28c1ba1d5dda09a48def32e6be10cdbc290e63b85769a85e27b68ab0bc6ef",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -47,7 +47,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "3c9b4f4c32d0880433951d6f9e3e516658aa37820abd29eb3ebcad3f8d03be22",
+                    "hash" : "bb177d808c1e3345f197c1690948a45da1b91056b93473a31f0f106be4b31683",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -55,7 +55,7 @@
                     }
                 },
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
@@ -73,7 +73,7 @@
                     }
                 },
                 {
-                    "hash" : "cfb28c1ba1d5dda09a48def32e6be10cdbc290e63b85769a85e27b68ab0bc6ef",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 1,
diff --git a/GeneralStateTests/stWalletTest/walletConstructionPartial.json b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
index 74215d4ae..efe1e6984 100644
--- a/GeneralStateTests/stWalletTest/walletConstructionPartial.json
+++ b/GeneralStateTests/stWalletTest/walletConstructionPartial.json
@@ -1,17 +1,17 @@
 {
-    "walletConstructionPartial " : {
+    "walletConstructionPartial" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "c26d9edc7d3a7869a06febbdf5f89fe361263fabd6b4e69919e2d4686360f24a",
+                    "hash" : "5d21e551199cf86e3d13645ec7f518611d676a76432196c10f2a8b8c5bf921f9",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "db8c1c5809f00578b61bd8b08d3f65318aa46c12b2affa8f18b59bbcf5eae69d",
+                    "hash" : "de273086f158a587a95f50228ec572815ee6b876800301869ae414bf74d6c095",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7",
+                    "hash" : "f5df26e4920624deca65021964db05a0d6146ef3f6531a03c8a4ace37056f0d5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletDefault.json b/GeneralStateTests/stWalletTest/walletDefault.json
index 42f17888a..ecf61cdc1 100644
--- a/GeneralStateTests/stWalletTest/walletDefault.json
+++ b/GeneralStateTests/stWalletTest/walletDefault.json
@@ -1,11 +1,11 @@
 {
-    "walletDefault " : {
+    "walletDefault" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json b/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
index 8da79e480..7bc6adeb8 100644
--- a/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
+++ b/GeneralStateTests/stWalletTest/walletDefaultWithOutValue.json
@@ -1,11 +1,11 @@
 {
-    "walletDefaultWithOutValue " : {
+    "walletDefaultWithOutValue" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
index ad569e32a..132d78586 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitMultiOwner.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteOverDailyLimitMultiOwner " : {
+    "walletExecuteOverDailyLimitMultiOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "39c41a9bb1ef618d353ac50d37c0c4105d27f7d2f72a33ce9f9e09267ea454d4",
+                    "hash" : "f36bbfa8ef75d0827091e979ab45f88aca100449e23efa61baa1ea9187450db2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "7fa8578f56078e6968c6eb4d78e7ce3b9d4f6737591fb510cd0f2997917364fe",
+                    "hash" : "4e98ab6f78c177e5a950cbae526866c7bf2f2245aa27e5d47cffcc513b49d3f3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "70e895d75fd4223ced63de48e748ce8199c5ceeff4793e8315c161f9723bbaf7",
+                    "hash" : "47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "70e895d75fd4223ced63de48e748ce8199c5ceeff4793e8315c161f9723bbaf7",
+                    "hash" : "47c3b7b4a9488688b0e7fdface2c118672bc9cd9cf7d56316b0d7c42b4530b18",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
index e04cf2b89..6cdd90a65 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwner.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteOverDailyLimitOnlyOneOwner " : {
+    "walletExecuteOverDailyLimitOnlyOneOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "68ea06f8a8373546423a99a7dac7019a7a5aee5dcead4bfd4fa37266dcb431c6",
+                    "hash" : "4560f9f796eadd8b25fa6aab7820c620399268377eb5183d45cecf11d3861005",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "9fc087bfbfa9e369c6be53c4a7ceadbe99924a6c063a175cad49e48ba129f208",
+                    "hash" : "c35acda0bf3e60848029418fa6e7f4b9f7de0d0b72ca136aa8cc19e866ab78d0",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "9bcebfe40914dc85779277c5ee18263b4ff7bbba11f1a4d16ffc9cf52ce8045e",
+                    "hash" : "2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "9bcebfe40914dc85779277c5ee18263b4ff7bbba11f1a4d16ffc9cf52ce8045e",
+                    "hash" : "2d54afeef9b30b0a8ccfb4c8017300d86f54e74ee22d348a0954ed60e24ddbf5",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
index fdee935fa..2669e6df8 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteOverDailyLimitOnlyOneOwnerNew.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteOverDailyLimitOnlyOneOwnerNew " : {
+    "walletExecuteOverDailyLimitOnlyOneOwnerNew" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "5430246c957676dfd15afc89c687b41ff114b3b21923b0b24a184f94fdc5793a",
+                    "hash" : "fb4f90b233539bf0aba711d7b1070b31421272a0a34c9f3c9cf5d531ee110ba3",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "adcc1c3e7bbb3765c9c6ce55ea77ddf54c7ca3d6cc1c61b35478150f05cec258",
+                    "hash" : "467ed06f47f9361f8b3112e8c5958013d8e1e4cae54784a1e5b56a079c611b85",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "1108db6168d39507d87ba3ba1c9a40e99f9393489c4a8577c71f73251bc72c07",
+                    "hash" : "0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "1108db6168d39507d87ba3ba1c9a40e99f9393489c4a8577c71f73251bc72c07",
+                    "hash" : "0d1e55d5b34a8dc8c28112c2c69d85d4bf22320367238cb469de61bde0041fc2",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json b/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
index b192fd7da..af1938f18 100644
--- a/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
+++ b/GeneralStateTests/stWalletTest/walletExecuteUnderDailyLimit.json
@@ -1,17 +1,17 @@
 {
-    "walletExecuteUnderDailyLimit " : {
+    "walletExecuteUnderDailyLimit" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
             "EIP150" : [
                 {
-                    "hash" : "c2c581694bc15abea73a08e924614a579cbdf069944ebd5d3daba67714e8f869",
+                    "hash" : "0c610f77ce142f0eaf4e1d797b2b747c59bf319e28dc79af20dac4b69b5d5927",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -21,7 +21,7 @@
             ],
             "EIP158" : [
                 {
-                    "hash" : "698f2b036b3d2cf9f35eb330c57073a4d67e6de806bc12b8f7f53c7629bfa8c6",
+                    "hash" : "689518c4f1ed3b9c2d585a105cd224aa01e5b951ec744d4fdb5d5b19ab6e8d63",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -31,7 +31,7 @@
             ],
             "Frontier" : [
                 {
-                    "hash" : "883670dccc674e0e6a9d5f8d15bcfd67b973d8506f0c454d4f1468db7cf9be4d",
+                    "hash" : "34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
@@ -41,7 +41,7 @@
             ],
             "Homestead" : [
                 {
-                    "hash" : "883670dccc674e0e6a9d5f8d15bcfd67b973d8506f0c454d4f1468db7cf9be4d",
+                    "hash" : "34221d1e5aed8f56e27a05cc9f59135b04a8889f4c36e58df32027e4445c00ad",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
diff --git a/GeneralStateTests/stWalletTest/walletKill.json b/GeneralStateTests/stWalletTest/walletKill.json
index 6ad9b8a8a..41a5aca4b 100644
--- a/GeneralStateTests/stWalletTest/walletKill.json
+++ b/GeneralStateTests/stWalletTest/walletKill.json
@@ -1,11 +1,11 @@
 {
-    "walletKill " : {
+    "walletKill" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletKillNotByOwner.json b/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
index 6ee210600..ec41c7625 100644
--- a/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
+++ b/GeneralStateTests/stWalletTest/walletKillNotByOwner.json
@@ -1,11 +1,11 @@
 {
-    "walletKillNotByOwner " : {
+    "walletKillNotByOwner" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletKillToWallet.json b/GeneralStateTests/stWalletTest/walletKillToWallet.json
index 1a7138c77..317999cc3 100644
--- a/GeneralStateTests/stWalletTest/walletKillToWallet.json
+++ b/GeneralStateTests/stWalletTest/walletKillToWallet.json
@@ -1,11 +1,11 @@
 {
-    "walletKillToWallet " : {
+    "walletKillToWallet" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json b/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
index 88f57143b..3a58a845a 100644
--- a/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
+++ b/GeneralStateTests/stWalletTest/walletRemoveOwnerRemovePendingTransaction.json
@@ -1,11 +1,11 @@
 {
-    "walletRemoveOwnerRemovePendingTransaction " : {
+    "walletRemoveOwnerRemovePendingTransaction" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x0100",
+            "currentDifficulty" : "0x20000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x00",
-            "currentTimestamp" : "0xfffffffff",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json
index 40ade4c34..508636cf3 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json
index 7e3773770..f3a956f0e 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToEmpty_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json
index a31c43397..c14f9c8fe 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json
index ffd61adbb..d9a55474f 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json
index 6469ec9aa..b8a734c27 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json
index 9b3948a33..f04c86e7c 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToEmpty_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json
index c7e05f122..ba4fd2fb8 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToNonZeroBalance_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json
index e029bf831..346f41526 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_CALL_ToOneStorageKey_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json
index 2ea241fc8..a447fcec4 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json
index 0d096539f..61c6d123f 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToEmpty_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json
index ca0501fe3..c31f63896 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json
index d2d3ba317..4d03136fc 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
index fbe2e5431..834827697 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
index daa3ed5b8..46ee0f5eb 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
index f19e3e8b0..79a570fbb 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
index cb869165b..64528d4af 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json
index 80513218e..288d4fdec 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json
index a390740ea..270f5facf 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToEmpty_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json
index 008c4d496..6ecc10851 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json
index 55dcb4313..a13cd6abb 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json
index 968c28030..71407a53e 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json
index 07bb2b2c3..b9bf33e52 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json
index 0fa422ff4..eac18e403 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json
index ccf5794b5..505168dbc 100644
--- a/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json
+++ b/GeneralStateTests/stZeroCallsRevert/ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
index 50e86a16b..4b856f2ff 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
index d52352f9c..26eaef396 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
index 678d1a25e..e4a96efee 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
index 0a27ddd8c..ceba846c2 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToNonZeroBalance.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
index 5ffd393cf..c5124a498 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALLCODE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
index c9e2a8180..cb427da9c 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToEmpty.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
index 735b4d519..1fde81cc9 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalance.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
index 79e0fc2c6..ddd424a98 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "ZeroValue_CALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
index 1b4ceacd3..d883cfe87 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
index 7a6fc94c1..f9ddfb0cd 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToEmpty.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
index 3a45f9046..86f3f8807 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToNonZeroBalance.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
index 1a15fde7b..36edf572d 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_DELEGATECALL_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "ZeroValue_DELEGATECALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
index 7ffc517d5..749636bee 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
index e5b92891d..27e79ed42 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToEmpty.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
index 4336fd5dd..30de8a8ae 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalance.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
index fc171f9d1..ecb831821 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "ZeroValue_SUICIDE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
index 8c5b19ec8..7a4b49928 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
index 51c36321b..c38956b45 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToEmpty.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
index 3ddac77f0..869681c69 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToNonZeroBalance.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
index 9fedf7216..aae4470db 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALL_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
index 2ac4d4088..bbf4ca5a7 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
index 6c7b17bdb..c08e52c06 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToEmpty.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
index 084b988fd..aeb273b6c 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToNonZeroBalance.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
diff --git a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
index 5e3a43925..1b204a88d 100644
--- a/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
+++ b/GeneralStateTests/stZeroCallsTest/ZeroValue_TransactionCALLwithData_ToOneStorageKey.json
@@ -2,10 +2,10 @@
     "ZeroValue_TransactionCALLwithData_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "0x02b8feb0",
+            "currentDifficulty" : "0x020000",
             "currentGasLimit" : "0x989680",
-            "currentNumber" : "0x28d138",
-            "currentTimestamp" : "0x01",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "post" : {
-- 
cgit v1.2.3