final async cleanups, make tests async too