Making the e-mail field optional + tests.