Updated tests with parser merge.