Added Javadocs and fixed FriendMapperTest where it wasn't removing from
friends list before we tried to clear the Users.