Need to be more flexible on timing tests