Updating tests. Adding support for asynchronous results