Merge pull request #473 from anodelman/fix-empty-tests

move to standardized error handling
(20583) `--install', `--type', and `--setup-dirs' are confusing
(21110) add the --load-path option