Merge "Add a zone export scenario test"