Set up tests to expect an asynchronous resolver
Make resolve trivially asynchronous