Fixed unit test issues for mailers