Fix failing tests

I will always run the build before pushing code
I will always run the build before pushing code
I will always run the build before pushing code
Merge pull request #161 from mkmurray/DefaultTimerFixes

Fix failing tests