#JC-1379 Fixed unit tests