Fix await/awaits lost updates and enable tests