CFY-642 fix some tests