Feature/cleanup mail tests

tests ready to rock again :)