#JC-1470 Added unit tests