Accepted defeat (testing emails is difficult) minor changes to test
cases