Revert "Use non-default keyring in test, so that we don't have extra messages."

This reverts commit ad623f7d74d75b0bb16c4ed1d2ae4b651dcad784.
Add keyring parameter to supress help messages on empty default keyring.