#JC-1201 Added tests.