[CLC-1361] Stashing away email in Oauth2:app_data

[CLC-1361] Tinkering with tests

[CLC-1361] Tinkering with tests