Revert "Fix tests for Zone -> ZoneName change"
Revert "Fix tests for Zone -> ZoneName change"

This reverts commit 5cca13c2890be98e1401a46c537a02dfd58736df.

BytemarkHosting/bytemark-client,BytemarkHosting/bytemark-client,BytemarkHosting/bytemark-client