Zone#match changes

Changes for Zone#match with tests.
Space missing to the left of {.