Fix email test failures.