fix tests with the new way to store email info
fix tests with the new way to store email info

guaycuru/gmvault,gaubert/gmvault,guaycuru/gmvault,erdincay/gmvault,erdincay/gmvault,guaycuru/gmvault,gaubert/gmvault,erdincay/gmvault,gaubert/gmvault