Updated UserFriendRequest gateway, mapper and test