Break out FriendUpdater tests
Remove explicit None checks