Start adding the async stuff to the rest of the tests.