Well, the way that the existing FriendEndpoint unit test is written, we can actually change an existing friend's email address while preserving the identity, so I left this alone.  Now, it's not clear to me why we need that functionality, but I was generally trying not to stray too far from the original implementation.