Add tests and matchers