Switched from rmail to mail add made tests pass