Return user from test helper to avoid changing API