updated spec to move attributes to tags