Implement the Timer class, solidify the tests a little bit