Using mail.Address
Fixed Reset() and added more decent tests
Merged and added new changes