added mail test support