Use Table methods for zone selection

Fixes current zone test failures.