Refactor timers in a similar manner to counters; test coverage