Minor improvement of UT