Add refactored nget commands and UT