Zone#match changes

Changes for Zone#match with tests.
`end` at 63, 58 is not aligned with `let(:address) { create(:address,` at 61, 6