Updated tests to work with new Timer class.