CFY-800 test fixes