CFY-1232 test bug fix