cleanup of some things after the renaming of subset to view

Fixes test which was failing because the --private short option was changed. Also cleans up some other things relating to the renaming of subset to view.