Parser updates + tests