Fixes #4350 - Allow any format for role name (fix tests)