fixed some test mail issues