Parser: added tests
Parser: clean up
Parser: fix