Deleted old Timer files that was missing (being deleted) from d62690d.
Fixed timer tests that were broken due to removed timer files in repo.