CFY-1379 fix tests