Improved tests
Merge branch 'master' of github.com:pavel-mihailovskiy/mailid