timer/test fixes