improce match-test