fix up and test timer accounting
improve time accounting and tests