Fix a broken build that came forward due to asynchronous dependencies in tests