Fix tests broken after upgrade

Good async fun