CFY-1604 tests
CFY-1604 tests