add validations and email tests