#JC-1636 fix unit tests