[CHORE] Refactoring using async
[FIX] Fixed some tests broken by switching to async style