Update tests.
Fix the recursion problems.
Improve the display of the default timer.