Timepicker improvements

Don't forget to correct the tests. ;)