CFY-648 fix tests