Updated tests for Zone(s)