CFY-1377 fix unit tests