CFY-800 fix broken tests