Update user validation and add tests