Fixed zones tests; fixed QA contact error with metadata
Merge pull request #1419 from mfalesni/zone-fix

Fixed zones tests; fixed QA contact error with metadata