made changes to timer related classes and unit tests