ST UT code fixes, and ut infra code changes

Change-Id: I13896b385db6de1f426493efecc1c6dc4c47fd42
Merge "ST UT code fixes, and ut infra code changes"