Improved responsivness, added email support for test suite