Test using less overrides

- Only trap the commands that will cause problems.
- Ensure that push/pull will remember to expand username/password with
  the stored remote url when called.