Merge "add UT to TreeTest"