[minor] Rename tests
[refactor] Small internals clean up for correctly accepting xRegExps.