Rewrite Timer to use untilDate, instread of count of ticks + tests