Trim down timer test, fix bug in test, should pass now