Created HtmlTemplate and macro.HtmlTemplate with tests