Make few improvements to the parser, fixed the method name mismatch in test cases