#JC-1588 Added unit test