Move avatar expectations to support. Rename resources to fixtures