Put time tests back in