Fix a broken test.

Also rename metasyntactic vars to not mention 'twitter', as
this was confusing to my grep searches for import changes.