use UT versions of ST code for UT

2 jobs for do-not-use-st-for-ut in 36 seconds