Fix a unit test failure on the slow ec2 instance (were not waiting long enough)