Cleanup add new tests for tree calsses