Test environment improvements
More tests
Add named trees, as suggested by @Tieske, plus tests.