Test tree is now drawn correctly
Clean up