Clean up the tree test to make it a bit more readable.