More tweaks and tests around the parser