Use Table methods for zone selection
Merge pull request #1371 from jkrocil/fix-zone-test

Use Table methods for zone selection