Ticket: Added userId and tests