Investigate if `addOperations:waitUntilFinished:` can be used in tests

[fastred]

Currently we use waitForExpectationsWithTimeout:handler: in tests using the hardcoded timeout values. It would be best to see if we can use addOperations:waitUntilFinished: instead.