Fix timer tests; refactor fake srpy output timer expectation