Also add tests. 'time' is a regression from 6647e8860698b8060eda3a2c5736c7718786743d (last Wednesday).