Merge "Increase coverage of Timers to 100%."