Improve user tests and validations