CFY-1511 fix tests