Timer: fixed tests, added support for in-query time