TSTGITPLUG-1 refactoring-9