Social methods, untested. Reorganize some of the comments
Tests for the social methods, plus fixes for bugs the tests found