Fixed an issue around the treatment of timezones and tweaked unit tests to be runnable in any zone