Remove remaining usage of UT

Cherry-picked from !394 (merged)

UT is not supported on this branch.

Merge request reports

Loading