Improvements to Psi parser

These commits and more unit tests, parse more data and fix/pass some tests.