Updates after running unit tests

After creating and running unit tests on the Email class, I have updated
the relavent parts of the other classes.