Rework file-size-matching tests to make use of match_by_size