cli changes and tests