Bugfixes.  Timer tests.