Fixed time tests by using zone, they will need help in future!