HSEARCH-1002

542 tests before and after refactoring. All should be good. No functional changes, just consistently switching to JUnit 4 using some sed pixie dust.