Small fixes to the Timer and TimerTest classes