JC-1658: Fixed tests according to new implementation