Fix tests for #2259 to use XCTestExpectation
Merge pull request #2307 from wordpress-mobile/issue/2259-fix-tests

Fix tests for #2259 to use XCTestExpectation