Merge pull request #509 from anna2130/nr-cli-enhancements

nr-cli enhancements
Updated to match cli changes
Updated tests to reflect addition of version getSet