Fix three more test failures seen in buildbot (one of them ported from main tree).
Attach a file by drag & drop or click to upload
