Remove email, supply all with getIdentity(), tests

Remove email, supply all with getIdentity(), tests