Fixes issue with timezones, more tests
3 files changed