JC-1449 - Added unit tests