Forgot Facebook template.  Added/improved some tests for FriendshipMapper