Add testing and validations on email