More unit tests
WIP
Merge remote-tracking branch 'federico/new-parser' into new-parser

* federico/new-parser:
  More unit tests