LUCENE-5666: clean up test and fix testSimple

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