Merge "Make FileStore tests more tolerant."