Cleaned up email models, added KeyManager tests, and removed redundant code in utility