Fix some test case races and .result file updates, found with Buildbot.
Attach a file by drag & drop or click to upload
