Remove usort function from matcher, fix zone matcher spec.

Remove usort function from matcher, fix zone matcher spec.