Fix async test errors in 4.0 and 4.5 build