CFY-1000 fixed tests