(Semantic test)

And some tree enhancements.