Fixed bugs for remaining parser tests.