CFY-516 test changes