Timezone correctness

Inspired by #24 this adjusts the tests so they correctly detect the timezone mismatch issue, and fixes the bug.