Change: Make the sending of test emails a bit more idiomatic and less lines of code