Add tests & code for AP-style times