Tests updated and fixed
Merge pull request #489 from owdqa/email_public

Tests updated and fixed