Merge "Improve the zone import API tests"