Timer unit-test fixes