Added e-mail tests for tasks
Fixed some missing new-lines and unused modules