Fix a timing issue in the test suite