Cleaned up tests for tree structure