Changed back to old wait() acceptance tests.