In review, the id attribute of avatar services was changed to

avatar_service_id. This patch corrects all instances that were missed,

as well as fixing some unit tests that were missing an HTML class name

in the expected output.

Ran unit tests.
Tested this patch with Review Board.