[WIP] Add some more tests to parser