Add not_contain and not_empty matchers