CFY-1025 fix tests