Add more tests for parser