fix user model rules and tests