Timezone fixes to help with tests