Added mail server to test tools
Merge pull request #485 from stianst/master

Added mail server to test tools