Started adjusting tests for new async APIs