User model tests complete
User conflict