HSEARCH-1549

Here is effectively what I want to do with the test support classes. Ignore the HSEARCH-1121 commits. This is pull request is based on this branch and I think we should finalize this one first. Once that is in, I can rebase this.

Just wanted to give a heads up. Basically it is just a bunch of class movements + some renames. Effectively it separates the actual tests from the test setup/support classes.