Improves Timer and Fixes Pending Test