Fixing and enhancing test mail sending