Changed the way we wait for async tests