Renamed some TemplateParser test cases
Still fixing doc