Using classes instead of list of dictionaries for describing the model being kept in the parser, and added a test template.