JC-1497 Added tests.