Merge "Split WikiPageTest into ContentHandler & NoContentHandler tests"