Fixed parser to support other report formats too. Added two testcases.