Added validation to ensure that a Term has both a matcher and a generate value, and that the value to generate matches the given regular expression