* Add failing tests for issue #1139 re: --force-reinstall.
* Address issue #1139: make --force-reinstall not require --upgrade.
* Address review comments.
* Address @xavfernandez's review comments.
This makes the new tests not require network access.