Async test fixes

Work-in-progress PR for various async related test fixes.