Addin PassphraseKeyStore tests
Updating tests for refactors