Improve user validations and tests