JC-1466 refactoring tests