CFY-1025 small changes in test