Make timer tests less racy

Change-Id: I9f731608427ce90769e29e041f6cc5738c512836
2 files changed