Add email downcase test
Refactor User model