refactored a bit + fix broken tests + add some beans for email configuration sender