Fix tests, only look up user name if not specified.