Merge "ContentHandler: simplify tag tests"