More tests and refactorings for admin approval email