Updated key_storage option to take class name

Increased test coverage, modified to use class names instead of enums.

This change is needed for at least the Magento Plugin since the plugin uses a custom class to persist and load keys using Magento classes. This should also help other plugins as well.