remove old zones test
more case fixes in Zone