Merge pull request #497 from owdqa/bug/fix_sms_firee

Minor change in message checking
Minor changes for Fire E
Merge pull request #502 from owdqa/bug/fix_firee

Minor changes for Fire E
Move MockContact from tests
Solve conflicts for Pull request
Merge pull request #507 from owdqa/feature/mockcontact

Feature/mockcontact