Neatening up module definition for Parser
Adding test suite for Parser

needs more tests adding