Add waiting to fix flaky acceptance tests