SSP-1142 neutered JUnit tests for external data hand testing and some
code cleanup