#JC-1251 unit tests fix after review