Clean-up and improve async-utils tests

Change-Id: I181dc1ee9168279e15dd8d3cc162c0b85adb5346
Merge "Clean-up and improve async-utils tests"