Fixed problem when testing in other timezones