add matchers tests and fix