Added tests, simplified verify_email