Correct imports from post-revert async move
Fix unit test busted by moving async back