JC-1428 Fixed all unit tests