Merge test_htmlparser changes from 3.3.