Improve URL and Email tests