Add Match tests
Update dependencies