#JC-1565 - Added tests