Make parser new tests pass