Passed more tests, fixed an issue in Parser.