Wouldn't it make sense to just work the email checks and permutations into the existing test?