Fix two test-cases.

BKrev: 409aaa01f61zJivcmSNCYhfxSRPOiQ