Add more user attributes, improve authorization tests