Minor fixes for parser tests