Cleaner and more table-driven tests for time