'Refactoring of HtmlTag + Tests' second part