Async test update

Hope I fixed the conflicts