JC-1428 Fixed unit tests