Merge pull request #25 from jangahroo/master

(test) fixed tests for parser
(test) updated tests and reimplemented end to end test