SRCH-111 refactor after data scale testing

git-svn-id: https://source.sakaiproject.org/svn/search/trunk@120867 66ffb92e-73f9-0310-93c1-f5514f145a0a
CLE-10110 add some more waits for build servers to be happy running tests

git-svn-id: https://source.sakaiproject.org/svn/search/trunk@120868 66ffb92e-73f9-0310-93c1-f5514f145a0a
CLE-10110 add some more waits for build servers to be happy running tests

git-svn-id: https://source.sakaiproject.org/svn/search/trunk@120869 66ffb92e-73f9-0310-93c1-f5514f145a0a