Updated test specs and user validations