Added AttributeTest expression.
Reduced visibility of NAME_PATTERN.