Fix tests broken by timezone issues