Make use of timezones conditional

and add tests