CFY-616 improve test