Added user tests + validations