Fix all but one test for async