Add tests for user provided matcher functions
Add support for simple matchers