tree collector unit test, minor edits