Fix email login test and country serializer
Merge pull request #358 from gannetson/fix-tests-for-email-login

Fix email login test and country serializer