Added more test cases for parser