Add avatars to entities. Closes #27
Fix broken tests after #30