CFY-1604 tests