JC-1688: unit test refactoring