changed match and nomatch to check the set value, also modified tests