fix naive test_imap_errors merge test failure