LUCENE-5635: speed up and improve test

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1591726 13f79535-47bb-0310-9956-ffa450edef68