Cleanup - tests
New tree widget