Fixed zones tests; fixed QA contact error with metadata

This was ruining some tests after the zone tests due to caching issue.