CFY-1155 fix tests