UT Refactor - non-Roslyn build failure fix