fix highlighting HTML tags and update tests