More tests, parse tree tweaks