Fix unit tests for the new parser