Unfudge now passing timer related tests

jnthn++