Fix + test that asynchronous calls also work