Better test for matches