Clean up tests a bit

Clean up tests a bit and add regression for html comments in headings.

Bug: 59717
Change-Id: I418022e90b6f5eba82b6d968690f2d24cccebc40
Merge "Clean up tests a bit"