Update tests to reflect changes to HtmlLexer instruction parsing.
Cleanup