Fixes in async test

code is cleaner