Fix orders in the argument of make() method
Add and update sample emails
Update test code
Add sample email and update test code