Adding more waits to tests.