Refactoring for TCRSmoke tests