Fixed the remaining issues with async tests