Cleaned code,removed unnecessary log msgs and updated dataset.xml file for junit tests