More null checks
Add tests for unified social links