Fixed issue with Timer

Timing of the timer was off, which atleast caused some tests to not run.