Cleaned up FriendshipController and FriendshipController tests.