Updated to match cli changes
Updated tests to reflect addition of version getSet
Merge pull request #511 from anna2130/nr-cli-enhancements

Updates to match cli changes