Fix for better testing: don't include keys not present in options in return value of setup_recipients method
Fix bug: don't fail if mail[address_type] is nil
Add test
Simplify code