Refactored timer unit tests