Fixed parser and added unit test.