Add Timer with Test
Remove test lines