Add test for other tokens in Element doctype
Make previous tests pass

- Revises get_entity_ref_token to work with Entity and Parameter
  Entity references
- Add parsing for Comma token