Further UT improvements

No match.