#JC-1647 Fixed unit tests