TSTGITPLUG-1 refactoring-3