command/keyring: remove unneeded -wan arg, fix tests