Fix tests for #2259 to use XCTestExpectation

No more AsyncTestHelper :smile: 

See #2259