Fix email login test and country serializer

Fixes test with email login
Fixes country serializer issues