Added emails, updated unit tests.