Update deps
Add a couple more match tests