added UI validations, need to imrpove test specificity