Zone#match changes

Changes for Zone#match with tests.