Refactored and added more test for ParserTest
Tagged @author