Try to remove timing issues from potential test failures