added support for e-mail parameter, new functionality in test server+++