Merge pull request #521 from leider/master

test now has same timezone info as the production code