Revert "zone tests"

This reverts commit 03615a91fd647f38b8a78918ed3a7134a544620c.
Fixed faulty commits in master.