TSTGITPLUG-1 refactoring-6