Enhancements user model and tests