fix tests failings resulting from adding user_id to the response