Beat the timing issue I was having in the tests