cleaned up tree and test slightly