store: Refactored store, keyring & tests to accomidate mode storage