Fix test; remove obsolete tests; move to XCTestExpectation