#JC-1262 Fixed unit tests