#JC-1795 Fixed unit tests