Updated logic of the email Junits to test more specific email attributes