Added test small fixes to the parser..