keyring: Fixes for store & keyring (tests)