Made slight changes to parser
Added test cases for parser