Removed tree.
Fixed up tests. Again.