Move user model to _user; make tests work