Feature/partial parser tests

Includes 2 bugfixes