Minor fixes in order to fix the test
Merge pull request #478 from owdqa/hotfix/email-26750

Minor fixes in order to fix the test