Improvements to the pretty-printer test
bug fixes in expression parsing