Adding tests and fixing logic issue for OR matchers