Never prompt for password if it was passed as an argument (fixes #195)

Took the liberty of also fixing one pre-existing test related to passwords that was marked as disabled until now.
2 files changed