Fix up unit tests
Merge branch 'hotfix/time-tests'