#JC-1361 unit tests fixed