Updated Timer and timer test page