Updated SharkPublicKeyStorage and its respective tests