Zone#match changes

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