Some changes to TestMailItem creation