LUCENE-5272: fix more test bugs

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