CFY-1274 test fixes