Fix parser tests

Update parser tests for latest changes in the last pull.