Some renaming + some tests

ContentParser add capability to fetch output from the ContentHandler as well

Change-Id: I63b7e4b14556ec650493ecb5ac59304dad2242bf