Add User model and Email model plus tests (Version++)