We are also going to want to add a test that includes IMAP and POP3 in a single file with IMAP first and ensure that our decision is IMAP and not POP3.  (What horror we would be unleashing on the world if that happened!)