CFY-971 fixed tests