Fix HtmlParserLinkExtractor and tests after #485 merge