Updated tester and new Timer code