Refactor to be able to process e-mail addresses, full URIs, and URIs that are missing schemes
Update unit test