Add more email validation and testing