#JC-1724 - added unit tests