#JC-1470 Fixed unit tests