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