Un-exclude two UT classes