fixes broken tests for mailbox