Replace time, add acceptable tests