Test timers

Plus the corresponding fixes.