Zone#match changes

Changes for Zone#match with tests.
Line is too long. [87/80]