Parser class and Test class were updated