Merge Users and User into the User model (and rewrite tests)