matcher: add some more tests. fix comparisons.