Add async back
Update tests