CFY-1363 fix tests
CFY-1363 fix tests