#JC-1251 unit tests