TSTGITPLUG-1 refactoring-8