Added multiple tests and debuged the parser, with Michael.