Merge "New API test cases for a Zone test suite."