Zone#match changes

Changes for Zone#match with tests.
Prefer single-quoted strings when you don't need string interpolation or special symbols.