LUCENE-6755: fix test bug and increase num of docs to improve chances of random query matching (merge r1696867)